From b5d51e30d9d86bba5a08d33fa4fd2173565061c7 Mon Sep 17 00:00:00 2001
From: Riccardo Spagni <ric@spagni.net>
Date: Mon, 22 Sep 2014 12:30:53 +0200
Subject: [PATCH] moved msys2 toolchain, boost libs fix

---
 CMakeLists.txt                          | 4 ++++
 {msys2 => cmake}/32-bit-toolchain.cmake | 2 +-
 {msys2 => cmake}/64-bit-toolchain.cmake | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename {msys2 => cmake}/32-bit-toolchain.cmake (92%)
 rename {msys2 => cmake}/64-bit-toolchain.cmake (92%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf3b8cf1..87567473 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
similarity index 92%
rename from msys2/32-bit-toolchain.cmake
rename to cmake/32-bit-toolchain.cmake
index 91665a21..4543c106 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
similarity index 92%
rename from msys2/64-bit-toolchain.cmake
rename to cmake/64-bit-toolchain.cmake
index 93d69d89..e9b3cc51 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