From f1793657d5441196d8ce5b00899ba30b27b5b096 Mon Sep 17 00:00:00 2001 From: Stefan Bienert <stefan.bienert@unibas.ch> Date: Thu, 28 May 2015 15:43:18 +0200 Subject: [PATCH] Introduced a plugin path variable for OpenMM (just the variable, its not used for now) --- CMakeLists.txt | 6 +++++- cmake_support/FindOpenMM.cmake | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86fc77fe4..413959a6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,7 +243,10 @@ endif() if(ENABLE_MM) find_package(OpenMM REQUIRED) -endif() + set(_OPENMM_PLUGINS "${OPEN_MM_PLUGIN_DIR}") +else(ENABLE_MM) + set(_OPENMM_PLUGINS "NONE") +endif(ENABLE_MM) if (ENABLE_IMG) find_package(FFTW REQUIRED) @@ -357,6 +360,7 @@ message(STATUS " Numpy support (-DUSE_NUMPY) : ${_NUMPY}\n" " SpaceNav Device support (-DENABLE_SPNAV) : ${_SPNAV}\n" " OpenMM support (-DENABLE_MM) : ${_OPENMM}\n" + " OpenMM plugins (-DOPEN_MM_PLUGIN_DIR) : ${_OPENMM_PLUGINS}\n" " Optimize (-DOPTIMIZE) : ${_OPT}\n" " Profiling support (-DPROFILE) : ${_PROFILE}\n" " Double Precision (-DUSE_DOUBLE_PRECISION) : ${_DOUBLE_PREC}\n" diff --git a/cmake_support/FindOpenMM.cmake b/cmake_support/FindOpenMM.cmake index 9888c4a2c..d4581c95e 100644 --- a/cmake_support/FindOpenMM.cmake +++ b/cmake_support/FindOpenMM.cmake @@ -4,9 +4,10 @@ # - Find OpenMM # Find the native OpenMM includes and library # -# OpenMM_INCLUDE_DIRS - OpenMM include dirs. -# OpenMM_LIBRARIES - List of libraries when using OpenMM. -# OpenMM_FOUND - True if OpenMM found. +# OPEN_MM_INCLUDE_DIR - OpenMM include dirs. +# OPEN_MM_LIBRARIES - List of libraries when using OpenMM. +# OPEN_MM_FOUND - True if OpenMM found. +# OPEN_MM_PLUGIN_DIR - Default for ressource plugins if (OPEN_MM_INCLUDE_DIR) set(OPEN_MM_FOUND TRUE) @@ -28,4 +29,15 @@ set(OPEN_MM_INCLUDE_DIRS ${OPEN_MM_INCLUDE_DIR}) include (FindPackageHandleStandardArgs) find_package_handle_standard_args (OpenMM DEFAULT_MSG OPEN_MM_LIBRARY OPEN_MM_INCLUDE_DIR) -mark_as_advanced (OPEN_MM_LIBRARY OPEN_MM_INCLUDE_DIR) +if (OPEN_MM_LIBRARY) + set(OPEN_MM_FOUND TRUE) + if (NOT OPEN_MM_PLUGIN_DIR) + set(OPEN_MM_PLUGIN_DIR "/usr/local/openmm/lib/plugins") + endif (NOT OPEN_MM_PLUGIN_DIR) + if (NOT EXISTS "${OPEN_MM_PLUGIN_DIR}") + message(FATAL_ERROR "OpenMM plugin directory does not exist: '${OPEN_MM_PLUGIN_DIR}'") + endif (NOT EXISTS "${OPEN_MM_PLUGIN_DIR}") +endif (OPEN_MM_LIBRARY) + +mark_as_advanced (OPEN_MM_LIBRARY OPEN_MM_INCLUDE_DIR OPEN_MM_FOUND + OPEN_MM_PLUGIN_DIR) -- GitLab