Adds a gtest_disable_pthreads CMake option; also fixes an include order problem in the cmake script.

git-svn-id: http://googletest.googlecode.com/svn/trunk@489 861a406c-534a-0410-8894-cb66d6ee9925

1 files changed, 6 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 316d257..130719f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,5 @@
 ########################################################################
-# Experimental CMake build script for Google Test.
-#
-# Consider this a prototype.  It will change drastically.  For now,
-# this is only for people on the cutting edge.
+# CMake build script for Google Test.
 #
 # To run the tests for Google Test itself on Linux, use 'make test' or
 # ctest.  You can select which tests to run using 'ctest -R regex'.
@@ -23,6 +20,9 @@ option(gtest_build_tests "Build all of gtest's own tests." OFF)
 
 option(gtest_build_samples "Build gtest's sample programs." OFF)
 
+option(gtest_disable_pthreads "Disable uses of pthreads in gtest." OFF)
+
+# Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
 include(cmake/hermetic_build.cmake OPTIONAL)
 
 if (COMMAND pre_project_set_up_hermetic_build)
@@ -46,10 +46,10 @@ if (COMMAND set_up_hermetic_build)
   set_up_hermetic_build()
 endif()
 
-# Defines functions and variables used by Google Test.
+# Define helper functions and macros used by Google Test.
 include(cmake/internal_utils.cmake)
 
-fix_default_settings()  # Defined in internal_utils.cmake.
+config_compiler_and_linker()  # Defined in internal_utils.cmake.
 
 # Where Google Test's .h files can be found.
 include_directories(