[Bf-blender-cvs] [be87bc6] master: Next step of fix for gtests (but still not working...)

Bastien Montagne noreply at git.blender.org
Mon Jan 4 19:30:19 CET 2016


Commit: be87bc6bd8c3047faba4a4347126f58932e16d65
Author: Bastien Montagne
Date:   Mon Jan 4 19:29:42 2016 +0100
Branches: master
https://developer.blender.org/rBbe87bc6bd8c3047faba4a4347126f58932e16d65

Next step of fix for gtests (but still not working...)

===================================================================

M	build_files/cmake/Modules/GTestTesting.cmake

===================================================================

diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake
index cb0d33d..16882a6 100644
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -20,8 +20,8 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
 		set(TEST_INC
 			${_current_include_directories}
 			${CMAKE_SOURCE_DIR}/tests/gtests
-			${CMAKE_SOURCE_DIR}/extern/libmv/third_party/glog/src
-			${CMAKE_SOURCE_DIR}/extern/libmv/third_party/gflags
+			${CMAKE_SOURCE_DIR}/extern/glog/src
+			${CMAKE_SOURCE_DIR}/extern/gflags/src
 			${CMAKE_SOURCE_DIR}/extern/gtest/include
 		)
 		unset(_current_include_directories)




More information about the Bf-blender-cvs mailing list