Add missing linker flags

Also fix library for template CMakeLists.txt.template

Change-Id: I4e436d54b0565971a3246e997b085ff8939fa0b3

diff --git a/share/template/CMakeLists.txt b/share/template/CMakeLists.txt
index 8e5603f10bf436d3385109774bd86a871c26090d..223b1c540e66451f73ecc7995c8936a64d7d6726 100644 (file)
--- a/share/template/CMakeLists.txt
+++ b/share/template/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_executable(template template.cpp)
-target_link_libraries(template libgromacs)
+target_link_libraries(template libgromacs ${GMX_EXE_LINKER_FLAGS})
 install(FILES CMakeLists.txt.template
         DESTINATION ${DATA_INSTALL_DIR}/template
         RENAME CMakeLists.txt

diff --git a/share/template/CMakeLists.txt.template b/share/template/CMakeLists.txt.template
index 2e39bda89406f61a7ce5fe1f7599e647bf7d96c7..001dc8926e1820cd8c1d44a682fdd73e269259ed 100644 (file)
--- a/share/template/CMakeLists.txt.template
+++ b/share/template/CMakeLists.txt.template
@@ -28,9 +28,9 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio")
 ########################################################################
 
 if (GMX_DOUBLE)
-  set(LIBGROMACS "libgmx_d")
+  set(LIBGROMACS "libgromacs_d")
 else(GMX_DOUBLE)
-  set(LIBGROMACS "libgmx")
+  set(LIBGROMACS "libgromacs")
 endif(GMX_DOUBLE)
 
 FIND_PACKAGE(GROMACS COMPONENTS ${LIBGROMACS} REQUIRED)

diff --git a/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt b/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt
index a12049f9397684ae106f6b0a7898872f61a6bf46..ae69962c7dddf622e308a52acf723cc6a51af917 100644 (file)
--- a/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt
+++ b/src/gromacs/trajectoryanalysis/tests/CMakeLists.txt
@@ -4,4 +4,4 @@ gmx_add_unit_test(TrajectoryAnalysisUnitTests trajectoryanalysis-test
                   select.cpp)
 
 add_executable(test_selection test_selection.cpp)
-target_link_libraries(test_selection libgromacs)
+target_link_libraries(test_selection libgromacs ${GMX_EXE_LINKER_FLAGS})

diff --git a/src/testutils/TestMacros.cmake b/src/testutils/TestMacros.cmake
index 9af5a7aff8ca317e9e032132b3bc9153511f4323..890aebbc5ebded32a51e9f4c6a562eeb47418a71 100644 (file)
--- a/src/testutils/TestMacros.cmake
+++ b/src/testutils/TestMacros.cmake
@@ -2,7 +2,7 @@ function (gmx_add_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})
+        target_link_libraries(${EXENAME} libgromacs ${TESTUTILS_LIBS} ${GMOCK_LIBRARIES} ${GMX_EXE_LINKER_FLAGS})
         get_target_property(DEFS ${EXENAME} COMPILE_DEFINITIONS)
         if (NOT DEFS)
             set(DEFS)