[Bf-blender-cvs] [489937e] master: GTest now works without buildinfo

Campbell Barton noreply at git.blender.org
Sun Jun 22 17:17:13 CEST 2014


Commit: 489937e1e7f89b3c21a4e13feaffbd400527f118
Author: Campbell Barton
Date:   Mon Jun 23 01:13:25 2014 +1000
https://developer.blender.org/rB489937e1e7f89b3c21a4e13feaffbd400527f118

GTest now works without buildinfo

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

M	tests/gtests/bmesh/CMakeLists.txt

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

diff --git a/tests/gtests/bmesh/CMakeLists.txt b/tests/gtests/bmesh/CMakeLists.txt
index aaee73d..b1166a6 100644
--- a/tests/gtests/bmesh/CMakeLists.txt
+++ b/tests/gtests/bmesh/CMakeLists.txt
@@ -39,5 +39,12 @@ get_property(BLENDER_SORTED_LIBS GLOBAL PROPERTY BLENDER_SORTED_LIBS_PROP)
 # for this test. Doubling the list does let all the symbols be resolved, but link time is a bit painful.
 set(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} ${BLENDER_SORTED_LIBS})
 
-BLENDER_SRC_GTEST(bmesh_core "bmesh_core_test.cc;$<TARGET_OBJECTS:buildinfoobj>" "${BLENDER_SORTED_LIBS}")
+if(WITH_BUILDINFO)
+	set(_buildinfo_src "$<TARGET_OBJECTS:buildinfoobj>")
+else()
+	set(_buildinfo_src "")
+endif()
+BLENDER_SRC_GTEST(bmesh_core "bmesh_core_test.cc;${_buildinfo_src}" "${BLENDER_SORTED_LIBS}")
+unset(_buildinfo_src)
+
 setup_liblinks(bmesh_core_test)




More information about the Bf-blender-cvs mailing list