Skip to content
This repository has been archived by the owner on Oct 12, 2023. It is now read-only.

Lock LibUV to commit w/ VS2017 support #334

Merged
merged 1 commit into from
Jul 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,11 @@ add_subdirectory(core)
include_directories(${GW_INC}) # GW_INC defined in core

if (${enable_core_remote_module_support})
cmake_minimum_required(VERSION 3.2.2)
add_subdirectory(proxy)
cmake_minimum_required(VERSION 3.2.2)
add_subdirectory(proxy)
if(LINUX)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -ldl -lrt -pthread")
endif()
endif()

add_subdirectory(modules)
Expand Down
4 changes: 2 additions & 2 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if(WIN32)
include_directories(${GW_INC}/windows )
elseif(UNIX) # LINUX or APPLE
include_directories(${GW_INC}/linux)
endif()
endif()

#setting the dynamic_loader file based on OS that it is used
if(WIN32)
Expand Down Expand Up @@ -107,7 +107,7 @@ set(gateway_h_sources
./inc/gateway_version.h
./src/gateway_internal.h
./inc/message_queue.h
./inc/broker.h
./inc/broker.h
)

# Add the module loaders
Expand Down
21 changes: 11 additions & 10 deletions tools/build_libuv.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,19 @@ pushd %build-root%
rem Clone libuv
git clone https://github.com/libuv/libuv.git
pushd libuv
git checkout -b v1.10.1 tags/v1.10.1

rem The following 2 variables must be un-defined because libuv's
rem vcbuild.bat skips its VS version detection code if these are
rem defined and defaults to using VS 2012.
set "WindowsSDKDir_Value=%WindowsSDKDir%"
set WindowsSDKDir=
set "VCINSTALLDIR=%VCINSTALLDIR%"
set VCINSTALLDIR=
git checkout -b v1.13.0 tags/v1.13.0

rem Build libuv
call vcbuild.bat release %1
if defined VisualStudioVersion if "%VisualStudioVersion%"=="15.0" (
call vcbuild.bat vs2017 release %1
) else (
@rem The following 2 variables must be un-defined because libuv's
@rem vcbuild.bat skips its VS version detection code if these are
@rem defined and defaults to using VS 2012.
set WindowsSDKDir=
set VCINSTALLDIR=
call vcbuild.bat release %1
)
popd

rem Create a 'dist' folder where the includes/libs live
Expand Down
2 changes: 1 addition & 1 deletion tools/build_libuv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ mkdir -p $build_root
pushd $build_root
git clone https://github.com/libuv/libuv.git
cd libuv
git checkout -b v1.11.0 tags/v1.11.0
git checkout -b v1.13.0 tags/v1.13.0
sh autogen.sh
./configure --prefix=$prefix --libdir=$libdir CFLAGS='-fPIC' CXXFLAGS='-fPIC'
make -j $(nproc)
Expand Down