diff options
| author | Herbert Thielen <thielen@hs-worms.de> | 2017-08-30 15:14:34 +0200 |
|---|---|---|
| committer | Herbert Thielen <thielen@hs-worms.de> | 2017-08-30 15:14:34 +0200 |
| commit | 47ad2993b68250d8fd5eb604d5a88ff976bb1a3e (patch) | |
| tree | c0b6f0135c30bf200939e05d9a25552e1217fff5 /googletest/cmake | |
| parent | 73d58dd4c83883b46697798e978d576b28b1d24e (diff) | |
| download | googletest-47ad2993b68250d8fd5eb604d5a88ff976bb1a3e.tar.gz googletest-47ad2993b68250d8fd5eb604d5a88ff976bb1a3e.tar.bz2 googletest-47ad2993b68250d8fd5eb604d5a88ff976bb1a3e.zip | |
Revert "ask cmake for per-configuration output subdir"
This reverts commit 73d58dd4c83883b46697798e978d576b28b1d24e.
Unfortunately, ${CMAKE_CFG_INTDIR} is set during build only and doesn't
help here.
Diffstat (limited to 'googletest/cmake')
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index cdaeb7a1..fb1fb683 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -245,7 +245,7 @@ function(py_test name) add_test( NAME ${name} COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) + --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>) else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) add_test( ${name} |