nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved msys2 toolchain, boost libs fix

Browse Source
This commit is contained in:
Riccardo Spagni 2014-09-22 12:30:53 +02:00
parent ca569549ec
commit b5d51e30d9
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -164,6 +164,10 @@ else()
endif() endif()
endif() endif()
if (BOOST_IGNORE_SYSTEM_PATHS)
set(Boost_NO_SYSTEM_PATHS TRUE)
endif()
if(STATIC) if(STATIC)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_STATIC_RUNTIME ON) set(Boost_USE_STATIC_RUNTIME ON)

2
msys2/32-bit-toolchain.cmake → cmake/32-bit-toolchain.cmake
View File

@ -8,7 +8,7 @@ set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE) #set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
set (CMAKE_RC_COMPILER windres) set (CMAKE_RC_COMPILER windres)
set (CMAKE_FIND_ROOT_PATH c:/msys2/mingw32) set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw32")
# Ensure cmake doesn't find things in the wrong places # Ensure cmake doesn't find things in the wrong places
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host

2
msys2/64-bit-toolchain.cmake → cmake/64-bit-toolchain.cmake
View File

@ -8,7 +8,7 @@ set (CMAKE_NM nm CACHE FILEPATH "" FORCE)
#set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE) #set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE)
set (CMAKE_RC_COMPILER windres) set (CMAKE_RC_COMPILER windres)
set (CMAKE_FIND_ROOT_PATH c:/msys2/mingw64) set (CMAKE_FIND_ROOT_PATH "${MSYS2_FOLDER}/mingw64")
# Ensure cmake doesn't find things in the wrong places # Ensure cmake doesn't find things in the wrong places
set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host