From ce7f76de1d216156bf390c4a19a431b2129c9309 Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@votca.org>
Date: Mon, 5 Nov 2018 07:39:23 -0700
Subject: [PATCH] cmake: switch plumed to full static mode
---
cmake/CMakeLists.txt | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2e2e316ee5..9559cb8a41 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -528,6 +528,7 @@ if(PKG_USER-SCAFACOS)
endif()
if(PKG_USER-PLUMED)
+ find_package(GSL REQUIRED)
option(DOWNLOAD_PLUMED "Download Plumed (instead of using the system's one)" OFF)
if(DOWNLOAD_PLUMED)
include(ExternalProject)
@@ -540,12 +541,14 @@ if(PKG_USER-PLUMED)
ExternalProject_get_property(plumed_build INSTALL_DIR)
set(PLUMED_INSTALL_DIR ${INSTALL_DIR})
list(APPEND LAMMPS_DEPS plumed_build)
- list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/libplumedWrapper.a ${CMAKE_DL_LIBS})
+ list(APPEND LAMMPS_LINK_LIBS ${PLUMED_INSTALL_DIR}/lib/plumed/obj/kernel.o
+ ${PLUMED_INSTALL_DIR}/lib/plumed/obj/PlumedStatic.o ${GSL_LIBRARIES} ${CMAKE_DL_LIBS})
set(PLUMED_INCLUDE_DIRS "${PLUMED_INSTALL_DIR}/include")
else()
find_package(PkgConfig REQUIRED)
- pkg_check_modules(PLUMED plumedWrapper REQUIRED)
- list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LDFLAGS})
+ pkg_check_modules(PLUMED plumed REQUIRED)
+ include(${PLUMED_LIBDIR}/plumed/src/lib/Plumed.cmake.static)
+ list(APPEND LAMMPS_LINK_LIBS ${PLUMED_LOAD})
endif()
include_directories(${PLUMED_INCLUDE_DIRS})
endif()
--
GitLab