diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-01-06 18:04:55 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-01-06 18:04:55 +0000 |
| commit | 276f4019c02a8bf6baadadb25e617017df448c44 (patch) | |
| tree | dc9c7dd78030290bf198d4c674f335e27d04d449 | |
| parent | edbcd6294e399be1ec2400c33b9d3aa9f6dbbf85 (diff) | |
| download | googletest-276f4019c02a8bf6baadadb25e617017df448c44.tar.gz googletest-276f4019c02a8bf6baadadb25e617017df448c44.tar.bz2 googletest-276f4019c02a8bf6baadadb25e617017df448c44.zip | |
Makes the cmake script work on Windows (by Manuel Klimek).
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f181af06..95b6e16a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ link_directories( # Defines the compiler/linker flags used to build gtest. You can # tweak these definitions to suit your need. if (MSVC) - set(cxx_base "${CMAKE_CXX_FLAGS} -GS -W4 -WX -wd4275 -RTCs -RTCu -nologo -J + set(cxx_base "${CMAKE_CXX_FLAGS} -GS -W4 -WX -wd4275 -nologo -J -Zi -D_UNICODE -DUNICODE -DWIN32 -D_WIN32 -DSTRICT -DWIN32_LEAN_AND_MEAN") set(cxx_default "${cxx_base} -EHsc -D_HAS_EXCEPTIONS=1") @@ -218,9 +218,13 @@ endif() # test/name.py. It does nothing if Python is not installed. function(py_test name) if (PYTHONINTERP_FOUND) + # ${gtest_BINARY_DIR} is known at configuration time, so we can + # directly bind it from cmake. ${CTEST_CONFIGURATION_TYPE} is known + # only at ctest runtime (by calling ctest -c <Configuration>), so + # we have to escape $ to delay variable substitution here. add_test(${name} ${PYTHON_EXECUTABLE} ${gtest_SOURCE_DIR}/test/${name}.py - --gtest_build_dir=${EXECUTABLE_OUTPUT_PATH}) + --gtest_build_dir=${gtest_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) endif() endfunction() |