diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-18 20:28:27 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-18 20:28:27 +0400 |
commit | 72b607ab7428d7900acc52e6b40dbd579a72241c (patch) | |
tree | 8c3ac655764fb9b27369d4a81c893559f7f2279d /extern | |
parent | 306cbb82ecf0d7c1ba4fb0a1240175b1976bd25b (diff) |
Some WITH_TESTS weer not renamed to WITH_GTEST
Diffstat (limited to 'extern')
-rw-r--r-- | extern/CMakeLists.txt | 2 | ||||
-rw-r--r-- | extern/libmv/CMakeLists.txt | 4 | ||||
-rwxr-xr-x | extern/libmv/bundle.sh | 4 |
3 files changed, 5 insertions, 5 deletions
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 |