sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Some WITH_TESTS weer not renamed to WITH_GTEST

Browse Source
This commit is contained in:
Sergey Sharybin 2014-06-18 22:28:27 +06:00
parent 306cbb82ec
commit 72b607ab74
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -2334,7 +2334,7 @@ endif()
#-----------------------------------------------------------------------------
# Libraries
if(WITH_TESTS)
if(WITH_GTESTS)
include(GTestTesting)
endif()

2
build_files/cmake/Modules/GTestTesting.cmake
View 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)

2
extern/CMakeLists.txt vendored
View File

@ -80,6 +80,6 @@ if(WITH_GHOST_XDND)
endif()
endif()
if(WITH_TESTS)
if(WITH_GTESTS)
add_subdirectory(gtest)
endif()

4
extern/libmv/CMakeLists.txt vendored
View 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

4
extern/libmv/bundle.sh vendored
View File

@ -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

2
tests/gtests/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# GTest
if(WITH_TESTS)
if(WITH_GTESTS)
Include(GTestTesting)