diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-09-22 12:30:53 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-22 12:30:53 +0200 |
| commit | b5d51e30d9d86bba5a08d33fa4fd2173565061c7 (patch) | |
| tree | 1979a345854658073f99d425809860d9189fd98d | |
| parent | added mikezackles' missing boost function in CMakeLists (diff) | |
| download | monero-b5d51e30d9d86bba5a08d33fa4fd2173565061c7.tar.xz | |
moved msys2 toolchain, boost libs fix
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/32-bit-toolchain.cmake (renamed from msys2/32-bit-toolchain.cmake) | 2 | ||||
| -rw-r--r-- | cmake/64-bit-toolchain.cmake (renamed from msys2/64-bit-toolchain.cmake) | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bf3b8cf18..875674733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,6 +164,10 @@ else() endif() endif() +if (BOOST_IGNORE_SYSTEM_PATHS) + set(Boost_NO_SYSTEM_PATHS TRUE) +endif() + if(STATIC) set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) diff --git a/msys2/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake index 91665a21b..4543c1066 100644 --- a/msys2/32-bit-toolchain.cmake +++ b/cmake/32-bit-toolchain.cmake @@ -8,7 +8,7 @@ set (CMAKE_NM nm CACHE FILEPATH "" FORCE) #set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE) 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 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host diff --git a/msys2/64-bit-toolchain.cmake b/cmake/64-bit-toolchain.cmake index 93d69d898..e9b3cc51b 100644 --- a/msys2/64-bit-toolchain.cmake +++ b/cmake/64-bit-toolchain.cmake @@ -8,7 +8,7 @@ set (CMAKE_NM nm CACHE FILEPATH "" FORCE) #set (CMAKE_RANLIB ${GCC_PREFIX}-gcc-ranlib CACHE FILEPATH "" FORCE) 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 set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) # Find programs on host |