Changed linking order to make Extrae work.

In addition removed redundant GMX_EXTRA_LIBRARIES linkage.
The list is already linked in libgromacs and there's no need
to include it again for mdrun and the tools.

Change-Id: I12e8d32f1f0fb2abceea2a5bd929fad563c1b609

diff --git a/src/gromacs/CMakeLists.txt b/src/gromacs/CMakeLists.txt
index 32194e942d2670e366ace078f4b4cfff601294c2..efbebe7607c8ecee7145fe0c4e0b29bf1ad085f3 100644 (file)
--- a/src/gromacs/CMakeLists.txt
+++ b/src/gromacs/CMakeLists.txt
@@ -153,10 +153,11 @@ else()
 endif()
 set_source_files_properties(selection/scanner.cpp PROPERTIES COMPILE_FLAGS "${_scanner_cpp_compiler_flags}")
 
-target_link_libraries(libgromacs ${GMX_GPU_LIBRARIES}
+target_link_libraries(libgromacs
+                      ${EXTRAE_LIBRARIES}
+                      ${GMX_GPU_LIBRARIES}
                       ${GMX_EXTRA_LIBRARIES}
                       ${GMX_TNG_LIBRARIES}
-                      ${EXTRAE_LIBRARIES}
                       ${FFT_LIBRARIES} ${LINEAR_ALGEBRA_LIBRARIES}
                       ${XML_LIBRARIES}
                       ${THREAD_LIB} ${GMX_SHARED_LINKER_FLAGS})

diff --git a/src/programs/CMakeLists.txt b/src/programs/CMakeLists.txt
index cf5ba06456941ac1d04712bd86bfcf90cab8d844..6d907b88e92326c24d1ef236d406c42596bd36f0 100644 (file)
--- a/src/programs/CMakeLists.txt
+++ b/src/programs/CMakeLists.txt
@@ -43,8 +43,7 @@ if(GMX_FAHCORE)
     add_library(fahcore $<TARGET_OBJECTS:mdrun_objlib>)
 elseif(GMX_BUILD_MDRUN_ONLY)
     add_executable(mdrun $<TARGET_OBJECTS:mdrun_objlib> mdrun_main.cpp)
-    target_link_libraries(mdrun
-        ${GMX_EXTRA_LIBRARIES} libgromacs ${GMX_EXE_LINKER_FLAGS})
+    target_link_libraries(mdrun libgromacs ${GMX_EXE_LINKER_FLAGS})
     set(BINARY_NAME "mdrun${GMX_BINARY_SUFFIX}")
     set_target_properties(mdrun PROPERTIES
         OUTPUT_NAME "${BINARY_NAME}"
@@ -66,8 +65,7 @@ else()
         ${GMX_MAIN_SOURCES}
         $<TARGET_OBJECTS:mdrun_objlib>
         $<TARGET_OBJECTS:view_objlib>)
-    target_link_libraries(gmx
-        ${GMX_EXTRA_LIBRARIES} libgromacs ${GMX_EXE_LINKER_FLAGS})
+    target_link_libraries(gmx libgromacs ${GMX_EXE_LINKER_FLAGS})
     if(GMX_X11)
         target_link_libraries(gmx ${X11_LIBRARIES})
     endif()