diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 2 | ||||
| -rw-r--r-- | extern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | extern/libmv/bundle.sh | 4 | ||||
| -rw-r--r-- | tests/gtests/CMakeLists.txt | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e21f977302..10182f9518d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2334,7 +2334,7 @@ endif() #----------------------------------------------------------------------------- # Libraries -if(WITH_TESTS) +if(WITH_GTESTS) include(GTestTesting) endif() diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index c039a1e1760..fd0379b8f78 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -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) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 999ffdadf4c..eda5b5bbd4c 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -80,6 +80,6 @@ if(WITH_GHOST_XDND) endif() endif() -if(WITH_TESTS) +if(WITH_GTESTS) add_subdirectory(gtest) endif() diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 62b387e8968..15a4fc7c4b9 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -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 diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 36df51770c5..53858a1e1b6 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -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 diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt index eb83c172409..2ab62fa05b0 100644 --- a/tests/gtests/CMakeLists.txt +++ b/tests/gtests/CMakeLists.txt @@ -1,6 +1,6 @@ # GTest -if(WITH_TESTS) +if(WITH_GTESTS) Include(GTestTesting) |