diff options
| author | Marat Dukhan <marat@fb.com> | 2017-10-24 17:20:59 -0700 |
|---|---|---|
| committer | Marat Dukhan <marat@fb.com> | 2017-10-24 17:20:59 -0700 |
| commit | 68818b5ec1732efc4517fe34a58499228868a55e (patch) | |
| tree | 5fca28d14b1f8bb44a2b44873065ede27897e2c3 | |
| parent | 759eca17e1497d903e296ffc00db0bd538d4edeb (diff) | |
| download | FXdiv-68818b5ec1732efc4517fe34a58499228868a55e.tar.gz | |
Small bug-fixes in CMake configs
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1913c47..804d9a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ OPTION(FXDIV_BUILD_TESTS "Build FXdiv unit tests" ON) OPTION(FXDIV_BUILD_BENCHMARKS "Build FXdiv micro-benchmarks" ON) # ---[ CMake options -LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) IF(FXDIV_BUILD_TESTS) ENABLE_TESTING() ENDIF() @@ -27,7 +26,7 @@ SET(CONFU_DEPENDENCIES_BINARY_DIR ${CMAKE_BINARY_DIR}/deps CACHE PATH "Confu-style dependencies binary directory") IF(NOT TARGET gtest) - CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake googletest-download/CMakeLists.txt) + CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt") EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download") EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build . @@ -35,7 +34,7 @@ IF(NOT TARGET gtest) ENDIF() IF(NOT TARGET benchmark) - CONFIGURE_FILE(cmake/DownloadGoogleBenchmark.cmake googlebenchmark-download/CMakeLists.txt) + CONFIGURE_FILE(cmake/DownloadGoogleBenchmark.cmake "${CMAKE_BINARY_DIR}/googlebenchmark-download/CMakeLists.txt") EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googlebenchmark-download") EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" --build . |