Commit: 72b607ab7428d7900acc52e6b40dbd579a72241c
Author: Sergey Sharybin
Date: Wed Jun 18 22:28:27 2014 +0600
https://developer.blender.org/rB72b607ab7428d7900acc52e6b40dbd579a72241c
Some WITH_TESTS weer not renamed to WITH_GTEST
===================================================================
M CMakeLists.txt
M build_files/cmake/Modules/GTestTesting.cmake
M extern/CMakeLists.txt
M extern/libmv/CMakeLists.txt
M extern/libmv/bundle.sh
M tests/gtests/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e21f97..10182f9 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 c039a1e..fd0379b 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 999ffda..eda5b5b 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 62b387e..15a4fc7 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 36df517..53858a1 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 eb83c17..2ab62fa 100644
--- a/tests/gtests/CMakeLists.txt
+++ b/tests/gtests/CMakeLists.txt
@@ -1,6 +1,6 @@
# GTest
-if(WITH_TESTS)
+if(WITH_GTESTS)
Include(GTestTesting)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
