diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-18 12:18:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-18 12:18:55 +0300 |
| commit | 9f25b2f278c3c5609828d5ac780c9f8dbadd9be2 (patch) | |
| tree | 49a311388f95640a99099c2f98491c65215d93a7 /CMakeLists.txt | |
| parent | 4d71579d3ba21ed1e51fc7c2d03e2d87f0327d77 (diff) | |
| parent | 4c22343271966752094b1e64af45fc5a5c6109b9 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e3fe49fce2c..54e2626e30e 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 |