Some WITH_TESTS weer not renamed to WITH_GTEST
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Jun 2014 16:28:27 +0000 (22:28 +0600)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Jun 2014 16:28:27 +0000 (22:28 +0600)
CMakeLists.txt
build_files/cmake/Modules/GTestTesting.cmake
extern/CMakeLists.txt
extern/libmv/CMakeLists.txt
extern/libmv/bundle.sh
tests/gtests/CMakeLists.txt

index 7e21f977302487a0bec6fc2193212c5cf3b21629..10182f9518dd498b517add41657a1dbb80da4b84 100644 (file)
@@ -2334,7 +2334,7 @@ endif()
 #-----------------------------------------------------------------------------
 # Libraries
 
-if(WITH_TESTS)
+if(WITH_GTESTS)
        include(GTestTesting)
 endif()
 
index c039a1e1760ea82b668f0279de90ecf38e34d9d5..fd0379b8f7850371c5f6ad0fd5a0e8ada0ee3add 100644 (file)
@@ -13,7 +13,7 @@
 #=============================================================================
 
 macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
-       if(WITH_TESTS)
+       if(WITH_GTESTS)
                get_property(_current_include_directories
                             DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
                             PROPERTY INCLUDE_DIRECTORIES)
index 999ffdadf4ca0efbc3d6f547c47b68802eadb518..eda5b5bbd4cc1fd75f8eb091b29df77c5e7c6763 100644 (file)
@@ -80,6 +80,6 @@ if(WITH_GHOST_XDND)
        endif()
 endif()
 
-if(WITH_TESTS)
+if(WITH_GTESTS)
        add_subdirectory(gtest)
 endif()
index 62b387e8968e5a0bfde67193172fd6fd85e96b91..15a4fc7c4b921d97328846fdcecf0eaffadf63ef 100644 (file)
@@ -169,7 +169,7 @@ if(WITH_LIBMV)
                endif()
        endif()
 
-       if(WITH_TESTS)
+       if(WITH_GTESTS)
                blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "")
        endif()
 
@@ -215,7 +215,7 @@ if(WITH_LIBMV)
 endif()
 
 # make GLog a separate target, so it can be used for gtest as well.
-if(WITH_LIBMV OR WITH_TESTS)
+if(WITH_LIBMV OR WITH_GTESTS)
        # We compile GLog together with GFlag so we don't worry about
        # adding extra lib to linker.
        set(GLOG_SRC
index 36df51770c501e3437c7cb46fc8e7e9082eea9e3..53858a1e1b6686a18bc5ea0a5b40164682c07422 100755 (executable)
@@ -175,7 +175,7 @@ ${third_headers}
                endif()
        endif()
 
-       if(WITH_TESTS)
+       if(WITH_GTESTS)
                blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}")
        endif()
 
@@ -193,7 +193,7 @@ if(WITH_LIBMV)
 endif()
 
 # make GLog a separate target, so it can be used for gtest as well.
-if(WITH_LIBMV OR WITH_TESTS)
+if(WITH_LIBMV OR WITH_GTESTS)
        # We compile GLog together with GFlag so we don't worry about
        # adding extra lib to linker.
        set(GLOG_SRC
index eb83c172409b28af0c13e1ba407d643d58c670bc..2ab62fa05b077c63abd3820a5901bbea5a968c06 100644 (file)
@@ -1,6 +1,6 @@
 
 # GTest
-if(WITH_TESTS)
+if(WITH_GTESTS)
 
        Include(GTestTesting)