Skip to content
Snippets Groups Projects
Commit 72b607ab authored by Sergey Sharybin's avatar Sergey Sharybin
Browse files

Some WITH_TESTS weer not renamed to WITH_GTEST

parent 306cbb82
No related branches found
No related tags found
No related merge requests found
...@@ -2334,7 +2334,7 @@ endif() ...@@ -2334,7 +2334,7 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Libraries # Libraries
if(WITH_TESTS) if(WITH_GTESTS)
include(GTestTesting) include(GTestTesting)
endif() endif()
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#============================================================================= #=============================================================================
macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS) macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
if(WITH_TESTS) if(WITH_GTESTS)
get_property(_current_include_directories get_property(_current_include_directories
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
PROPERTY INCLUDE_DIRECTORIES) PROPERTY INCLUDE_DIRECTORIES)
......
...@@ -80,6 +80,6 @@ if(WITH_GHOST_XDND) ...@@ -80,6 +80,6 @@ if(WITH_GHOST_XDND)
endif() endif()
endif() endif()
if(WITH_TESTS) if(WITH_GTESTS)
add_subdirectory(gtest) add_subdirectory(gtest)
endif() endif()
...@@ -169,7 +169,7 @@ if(WITH_LIBMV) ...@@ -169,7 +169,7 @@ if(WITH_LIBMV)
endif() endif()
endif() endif()
if(WITH_TESTS) if(WITH_GTESTS)
blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "") blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "")
endif() endif()
...@@ -215,7 +215,7 @@ if(WITH_LIBMV) ...@@ -215,7 +215,7 @@ if(WITH_LIBMV)
endif() endif()
# make GLog a separate target, so it can be used for gtest as well. # 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 # We compile GLog together with GFlag so we don't worry about
# adding extra lib to linker. # adding extra lib to linker.
set(GLOG_SRC set(GLOG_SRC
......
...@@ -175,7 +175,7 @@ ${third_headers} ...@@ -175,7 +175,7 @@ ${third_headers}
endif() endif()
endif() endif()
if(WITH_TESTS) if(WITH_GTESTS)
blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}") blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}")
endif() endif()
...@@ -193,7 +193,7 @@ if(WITH_LIBMV) ...@@ -193,7 +193,7 @@ if(WITH_LIBMV)
endif() endif()
# make GLog a separate target, so it can be used for gtest as well. # 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 # We compile GLog together with GFlag so we don't worry about
# adding extra lib to linker. # adding extra lib to linker.
set(GLOG_SRC set(GLOG_SRC
......
# GTest # GTest
if(WITH_TESTS) if(WITH_GTESTS)
Include(GTestTesting) Include(GTestTesting)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment