summaryrefslogtreecommitdiffstats
path: root/googletest/cmake
diff options
context:
space:
mode:
authorHerbert Thielen <thielen@hs-worms.de>2017-08-30 10:59:06 (GMT)
committerHerbert Thielen <thielen@hs-worms.de>2017-08-30 10:59:06 (GMT)
commit73d58dd4c83883b46697798e978d576b28b1d24e (patch)
tree103251d567091ddd6e4370fdc30b01d48ab754c5 /googletest/cmake
parent7529c8aa05c281d51db4e22a533d9b201f461993 (diff)
downloadgoogletest-73d58dd4c83883b46697798e978d576b28b1d24e.zip
googletest-73d58dd4c83883b46697798e978d576b28b1d24e.tar.gz
googletest-73d58dd4c83883b46697798e978d576b28b1d24e.tar.bz2
ask cmake for per-configuration output subdir
On single-configuration build systems as Makefile Generators, there is no subdirectory for the configuration in the build tree - therefore ask cmake for the subdir by using CMAKE_CFG_INTDIR, which is just '.' on single-configuration build systems (Linux et al.).
Diffstat (limited to 'googletest/cmake')
-rw-r--r--googletest/cmake/internal_utils.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
index fb1fb68..cdaeb7a 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}/$<CONFIGURATION>)
+ --build_dir=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
add_test(
${name}