gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renames CMake build script options.

Browse Source
This commit is contained in:
vladlosev 2010-05-11 09:37:33 +00:00
parent 61baf319bb
commit e588a3bba2
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -12,9 +12,9 @@
# make it prominent in the GUI. # make it prominent in the GUI.
option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF) option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
option(build_all_gtest_tests "Build all of gtest's own tests." OFF) option(gtest_build_tests "Build all of gtest's own tests." OFF)
option(build_gtest_samples "Build gtest's sample programs." OFF) option(gtest_build_samples "Build gtest's sample programs." OFF)
include(cmake/hermetic_build.cmake OPTIONAL) include(cmake/hermetic_build.cmake OPTIONAL)
@ -69,10 +69,10 @@ target_link_libraries(gtest_main gtest)
# Samples on how to link user tests with gtest or gtest_main. # Samples on how to link user tests with gtest or gtest_main.
# #
# They are not built by default. To build them, set the # They are not built by default. To build them, set the
# build_gtest_samples option to ON. You can do it by running ccmake # gtest_build_samples option to ON. You can do it by running ccmake
# or specifying the -Dbuild_gtest_samples=ON flag when running cmake. # or specifying the -Dbuild_gtest_samples=ON flag when running cmake.
if (build_gtest_samples) if (gtest_build_samples)
cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc) cxx_executable(sample1_unittest samples gtest_main samples/sample1.cc)
cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc) cxx_executable(sample2_unittest samples gtest_main samples/sample2.cc)
cxx_executable(sample3_unittest samples gtest_main) cxx_executable(sample3_unittest samples gtest_main)
@ -93,10 +93,10 @@ endif()
# Google Test itself. # Google Test itself.
# #
# Most of the tests are not built by default. To build them, set the # Most of the tests are not built by default. To build them, set the
# build_all_gtest_tests option to ON. You can do it by running ccmake # gtest_build_tests option to ON. You can do it by running ccmake
# or specifying the -Dbuild_all_gtest_tests=ON flag when running cmake. # or specifying the -Dgtest_build_tests=ON flag when running cmake.
if (build_all_gtest_tests) if (gtest_build_tests)
# This must be set in the root directory for the tests to be run by # This must be set in the root directory for the tests to be run by
# 'make test' or ctest. # 'make test' or ctest.
enable_testing() enable_testing()

7
README
View File

@ -171,7 +171,7 @@ workflow starts with:
If you want to build Google Test's samples, you should replace the If you want to build Google Test's samples, you should replace the
last command with last command with
cmake -Dbuild_gtest_samples=ON ${GTEST_DIR} cmake -Dgtest_build_samples=ON ${GTEST_DIR}
If you are on a *nix system, you should now see a Makefile in the If you are on a *nix system, you should now see a Makefile in the
current directory. Just type 'make' to build gtest. current directory. Just type 'make' to build gtest.
@ -371,7 +371,7 @@ For that you can use CMake:
mkdir mybuild mkdir mybuild
cd mybuild cd mybuild
cmake -Dbuild_all_gtest_tests=ON ${GTEST_DIR} cmake -Dgtest_build_tests=ON ${GTEST_DIR}
Make sure you have Python installed, as some of Google Test's tests Make sure you have Python installed, as some of Google Test's tests
are written in Python. If the cmake command complains about not being are written in Python. If the cmake command complains about not being
@ -379,8 +379,7 @@ able to find Python ("Could NOT find PythonInterp (missing:
PYTHON_EXECUTABLE)"), try telling it explicitly where your Python PYTHON_EXECUTABLE)"), try telling it explicitly where your Python
executable can be found: executable can be found:
cmake -DPYTHON_EXECUTABLE=path/to/python -Dbuild_all_gtest_tests=ON \ cmake -DPYTHON_EXECUTABLE=path/to/python -Dgtest_build_tests=ON ${GTEST_DIR}
${GTEST_DIR}
Next, you can build Google Test and all of its own tests. On *nix, Next, you can build Google Test and all of its own tests. On *nix,
this is usually done by 'make'. To run the tests, do this is usually done by 'make'. To run the tests, do