diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 11:58:01 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 13:01:27 +0300 |
commit | c7a5c48cbad0062c55bf9fa6df2926646b2c3091 (patch) | |
tree | d53c082e2c1d58bea374017f435269ccc2892e7d /tests | |
parent | 55a3d48046377444a3c36ffe7a6164030d447f6f (diff) |
CMake: Add option to link against system-wide Gflags library
It is disabled by default, so should not affect existing configurations.
Main benefits of this goes as:
- Linux distros can use that to avoid libraries duplication and link
blender package against gflags package from the system.
- It it easier to test whether Blender works with updated version of
Gflags prior to re-bundling the library.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/gtests/testing/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/gtests/testing/testing_main.cc | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt index ad77b1389f6..781da7bf452 100644 --- a/tests/gtests/CMakeLists.txt +++ b/tests/gtests/CMakeLists.txt @@ -6,6 +6,7 @@ if(WITH_GTESTS) add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) + add_definitions(-DBLENDER_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) # Otherwise we get warnings here that we cant fix in external projects remove_strict_flags() diff --git a/tests/gtests/testing/CMakeLists.txt b/tests/gtests/testing/CMakeLists.txt index 796f975ea65..defa51df664 100644 --- a/tests/gtests/testing/CMakeLists.txt +++ b/tests/gtests/testing/CMakeLists.txt @@ -24,7 +24,7 @@ set(INC . .. - ../../../extern/gflags/src + ${GFLAGS_INCLUDE_DIRS} ../../../extern/gtest/include ) diff --git a/tests/gtests/testing/testing_main.cc b/tests/gtests/testing/testing_main.cc index b2dcc445aca..e8104a2a026 100644 --- a/tests/gtests/testing/testing_main.cc +++ b/tests/gtests/testing/testing_main.cc @@ -28,7 +28,7 @@ int main(int argc, char **argv) { testing::InitGoogleTest(&argc, argv); - gflags::ParseCommandLineFlags(&argc, &argv, true); + BLENDER_GFLAGS_NAMESPACE::ParseCommandLineFlags(&argc, &argv, true); google::InitGoogleLogging(argv[0]); return RUN_ALL_TESTS(); |