[Bf-blender-cvs] [0a5f7061369] master: cmake/ctest: output test binaries to debug/release folders on windows.
Ray Molenkamp
noreply at git.blender.org
Fri Aug 17 18:05:13 CEST 2018
Commit: 0a5f7061369d53b4eac55362ad2e84e8b74d13ff
Author: Ray Molenkamp
Date: Fri Aug 17 10:04:55 2018 -0600
Branches: master
https://developer.blender.org/rB0a5f7061369d53b4eac55362ad2e84e8b74d13ff
cmake/ctest: output test binaries to debug/release folders on windows.
debug/release builds were writing the binaries to the same folder
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6435316fec..7c07d5e94ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,11 @@ enable_testing()
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
-set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests CACHE INTERNAL "" FORCE)
+if(MSVC)
+ set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/$<CONFIG>/ CACHE INTERNAL "" FORCE)
+else
+ set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/ CACHE INTERNAL "" FORCE)
+endif()
#-----------------------------------------------------------------------------
# Set default config options
More information about the Bf-blender-cvs
mailing list