From b2b2176c301e2f3f87424da97a3793977ceedae3 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Wed, 30 Mar 2016 17:05:09 +0200
Subject: [PATCH] Fixed plumed load in gmx 5.1 patch
With this change it looks I can solve an issue on my workstation
that has been reported on the mailing list (multiple linking
of Plumed.o object)
---
patches/gromacs-5.1.2.diff/src/gromacs/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/patches/gromacs-5.1.2.diff/src/gromacs/CMakeLists.txt b/patches/gromacs-5.1.2.diff/src/gromacs/CMakeLists.txt
index ee7174908..2af9fdf86 100644
--- a/patches/gromacs-5.1.2.diff/src/gromacs/CMakeLists.txt
+++ b/patches/gromacs-5.1.2.diff/src/gromacs/CMakeLists.txt
@@ -199,13 +199,17 @@ else()
endif()
set_source_files_properties(selection/scanner.cpp PROPERTIES COMPILE_FLAGS "${_scanner_cpp_compiler_flags}")
+target_link_libraries(libgromacs ${PLUMED_LOAD})
+
target_link_libraries(libgromacs
${EXTRAE_LIBRARIES}
${GMX_EXTRA_LIBRARIES}
${TNG_IO_LIBRARIES}
${FFT_LIBRARIES} ${LINEAR_ALGEBRA_LIBRARIES}
${XML_LIBRARIES}
- ${THREAD_LIB} ${GMX_SHARED_LINKER_FLAGS} ${OPENCL_LIBRARIES} ${PLUMED_LOAD})
+ ${THREAD_LIB} ${GMX_SHARED_LINKER_FLAGS} ${OPENCL_LIBRARIES})
+
+
set_target_properties(libgromacs PROPERTIES
OUTPUT_NAME "gromacs${GMX_LIBS_SUFFIX}"
SOVERSION ${LIBRARY_SOVERSION_MAJOR}
--
GitLab