[Bf-blender-cvs] [8525e1b] gtest-testing: Tests: move flag setting out of the BLENDER_TEST macro (was adding PLATFORM_LINKFLAGS for each test)

Campbell Barton noreply at git.blender.org
Tue May 20 11:15:06 CEST 2014


Commit: 8525e1b5e8c5ad3210419e336f7aa2409eb21cbe
Author: Campbell Barton
Date:   Tue May 20 19:14:14 2014 +1000
https://developer.blender.org/rB8525e1b5e8c5ad3210419e336f7aa2409eb21cbe

Tests: move flag setting out of the BLENDER_TEST macro
(was adding PLATFORM_LINKFLAGS for each test)

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

M	build_files/cmake/Modules/Testing.cmake
M	source/tests/blenlib_tests/CMakeLists.txt

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

diff --git a/build_files/cmake/Modules/Testing.cmake b/build_files/cmake/Modules/Testing.cmake
index 6c1c24c..2e14d6e 100644
--- a/build_files/cmake/Modules/Testing.cmake
+++ b/build_files/cmake/Modules/Testing.cmake
@@ -26,9 +26,6 @@ macro(BLENDER_SRC_TEST NAME SRC EXTRA_LIBS)
 		)
 		unset(_current_include_directories)
 
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
-		set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")
-
 		add_executable(${NAME}_test ${SRC})
 		target_link_libraries(${NAME}_test
 		                      ${EXTRA_LIBS}
diff --git a/source/tests/blenlib_tests/CMakeLists.txt b/source/tests/blenlib_tests/CMakeLists.txt
index e23f064..c0fd59d 100644
--- a/source/tests/blenlib_tests/CMakeLists.txt
+++ b/source/tests/blenlib_tests/CMakeLists.txt
@@ -29,6 +29,10 @@ set(INC
 
 include_directories(${INC})
 
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")
+
+
 BLENDER_TEST(mathutils_color "bf_blenlib")
 BLENDER_TEST(mathutils_geom "bf_blenlib")
 BLENDER_TEST(polyfill2d "bf_blenlib")




More information about the Bf-blender-cvs mailing list