works with ninja

unbornchikken · unbornchikken · commit 2bd29d21d29f · 2015-05-07T13:41:47.000+02:00
diff --git a/cmake/BoostLib.cmake b/cmake/BoostLib.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.2)
 
 include(BoostLibInstaller)
 
diff --git a/cmake/BoostLibInstaller.cmake b/cmake/BoostLibInstaller.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.2)
 
 include(ExternalProject)
 include(GetBoostLibB2Args)
@@ -123,6 +123,7 @@ function(boost_lib_installer req_boost_version req_boost_libs)
                     CONFIGURE_COMMAND ""
                     BUILD_COMMAND ""
                     INSTALL_COMMAND ""
+                    BUILD_BYPRODUCTS "${lib_path}"
                     LOG_BUILD OFF)
             else()
                 message(STATUS "Setting up external project to build ${lib}.")
@@ -134,6 +135,7 @@ function(boost_lib_installer req_boost_version req_boost_libs)
                     CONFIGURE_COMMAND ""
                     BUILD_COMMAND "${b2_command}" "${b2Args}" --with-${lib}
                     INSTALL_COMMAND ""
+                    BUILD_BYPRODUCTS "${lib_path}"
                     LOG_BUILD ON)
             endif()            
 
diff --git a/cmake/DownloadBoost.cmake b/cmake/DownloadBoost.cmake
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.2)
+
 function(download_boost version)
     find_file(cwd DownloadBoost.cmake PATHS ${CMAKE_MODULE_PATH})
     get_filename_component(cwd "${cwd}" DIRECTORY)
diff --git a/cmake/GetBoostLibB2Args.cmake b/cmake/GetBoostLibB2Args.cmake
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 3.2)
+
 function(get_boots_lib_b2_args)
     if(MSVC)
         if(CMAKE_CL_64 EQUAL 1)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-cmake_minimum_required(VERSION 2.8)`
	`1`	`+cmake_minimum_required(VERSION 3.2)`
`2`	`2`
`3`	`3`	`include(BoostLibInstaller)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+cmake_minimum_required(VERSION 3.2)`
	`2`	`+`
`1`	`3`	`function(download_boost version)`
`2`	`4`	`find_file(cwd DownloadBoost.cmake PATHS ${CMAKE_MODULE_PATH})`
`3`	`5`	`get_filename_component(cwd "${cwd}" DIRECTORY)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+cmake_minimum_required(VERSION 3.2)`
	`2`	`+`
`1`	`3`	`function(get_boots_lib_b2_args)`
`2`	`4`	`if(MSVC)`
`3`	`5`	`if(CMAKE_CL_64 EQUAL 1)`