Fix double linkage for tests

[alexxy/gromacs.git] / src / testutils / TestMacros.cmake

diff --git a/src/testutils/TestMacros.cmake b/src/testutils/TestMacros.cmake
index 17934162cdb68242c8c3ea7d922065c1e7e42a7a..b3acdbefd16539468521696d034ef14e18d7900b 100644 (file)
--- a/src/testutils/TestMacros.cmake
+++ b/src/testutils/TestMacros.cmake
@@ -34,16 +34,18 @@
 
 function (gmx_add_unit_test_object_library NAME)
     if (GMX_BUILD_UNITTESTS AND BUILD_TESTING)
-        include_directories(${GMOCK_INCLUDE_DIRS})
-        add_library(${NAME} OBJECT ${ARGN})
-    endif ()
+        include_directories(BEFORE ${GMOCK_INCLUDE_DIRS})
+        add_library(${NAME} OBJECT ${UNITTEST_TARGET_OPTIONS} ${ARGN})
+        set_property(TARGET ${NAME} APPEND PROPERTY COMPILE_DEFINITIONS "${GMOCK_COMPILE_DEFINITIONS}")
+    endif()
 endfunction ()
 
 function (gmx_build_unit_test NAME EXENAME)
     if (GMX_BUILD_UNITTESTS AND BUILD_TESTING)
-        include_directories(${GMOCK_INCLUDE_DIRS})
-        add_executable(${EXENAME} ${ARGN} ${TESTUTILS_DIR}/unittest_main.cpp)
-        target_link_libraries(${EXENAME} libgromacs ${TESTUTILS_LIBS} ${GMOCK_LIBRARIES} ${GMX_EXE_LINKER_FLAGS})
+        include_directories(BEFORE ${GMOCK_INCLUDE_DIRS})
+        add_executable(${EXENAME} ${UNITTEST_TARGET_OPTIONS} ${ARGN} ${TESTUTILS_DIR}/unittest_main.cpp)
+        set_property(TARGET ${EXENAME} APPEND PROPERTY COMPILE_DEFINITIONS "${GMOCK_COMPILE_DEFINITIONS}")
+        target_link_libraries(${EXENAME} ${TESTUTILS_LIBS} libgromacs ${GMOCK_LIBRARIES} ${GMX_EXE_LINKER_FLAGS})
         set(_temporary_files_path "${CMAKE_CURRENT_BINARY_DIR}/Testing/Temporary")
         file(MAKE_DIRECTORY ${_temporary_files_path})
 
@@ -53,7 +55,7 @@ function (gmx_build_unit_test NAME EXENAME)
         set(EXTRA_COMPILE_DEFINITIONS TEST_DATA_PATH="${CMAKE_CURRENT_SOURCE_DIR}" TEST_TEMP_PATH="${_temporary_files_path}")
 
         set_property(TARGET ${EXENAME} APPEND PROPERTY COMPILE_DEFINITIONS "${EXTRA_COMPILE_DEFINITIONS}")
-    endif ()
+    endif()
 endfunction ()
 
 function (gmx_register_unit_test NAME EXENAME)
@@ -62,7 +64,7 @@ function (gmx_register_unit_test NAME EXENAME)
                  COMMAND ${EXENAME} --gtest_output=xml:${CMAKE_BINARY_DIR}/Testing/Temporary/${NAME}.xml)
         set_tests_properties(${NAME} PROPERTIES LABELS "GTest;UnitTest")
         add_dependencies(tests ${EXENAME})
-    endif ()
+    endif()
 endfunction ()
 
 function (gmx_register_integration_test NAME EXENAME)
@@ -76,7 +78,7 @@ function (gmx_register_integration_test NAME EXENAME)
         # GMX_EXTRA_LIBRARIES might be needed for mdrun integration tests at
         # some point.
         # target_link_libraries(${EXENAME} ${GMX_EXTRA_LIBRARIES})
-    endif ()
+    endif()
 endfunction ()
 
 function (gmx_add_unit_test NAME EXENAME)