Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
276f4019
Commit
276f4019
authored
Jan 06, 2010
by
zhanyong.wan
Browse files
Makes the cmake script work on Windows (by Manuel Klimek).
parent
edbcd629
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
CMakeLists.txt
CMakeLists.txt
+6
-2
No files found.
CMakeLists.txt
View file @
276f4019
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment