PME Plugin can now be built statically

plugins/cpupme/CMakeLists.txt

@@ -22,7 +22,7 @@ SET(OPENMM_SOURCE_SUBDIRS .)
 SET(OPENMMPME_LIBRARY_NAME OpenMMPME)
 
 SET(SHARED_TARGET ${OPENMMPME_LIBRARY_NAME})
-
+SET(STATIC_TARGET ${OPENMMPME_LIBRARY_NAME}_static)
 
 # Ensure that debug libraries have "_d" appended to their names.
 # CMake gets this right on Windows automatically with this definition.
@@ -74,7 +74,7 @@ ENDIF (NOT MSVC)
 # Include FFTW related files.
 INCLUDE_DIRECTORIES(${FFTW_INCLUDES})
 
-# Build the plugin library.
+# Build the shared plugin library.
 ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_INCLUDE_FILES})
 
 IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
@@ -90,4 +90,22 @@ SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FL
 
 INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_TARGET})
 
+# Build the static plugin library.
+IF(OPENMM_BUILD_STATIC_LIB)
+    ADD_LIBRARY(${STATIC_TARGET} STATIC ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_INCLUDE_FILES})
+
+    IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
+        SET(MAIN_OPENMM_LIB ${OPENMM_LIBRARY_NAME}_d)
+    ELSE (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
+        SET(MAIN_OPENMM_LIB ${OPENMM_LIBRARY_NAME})
+    ENDIF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
+    TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${MAIN_OPENMM_LIB} ${PTHREADS_LIB} ${FFTW_LIBRARY})
+    IF (FFTW_THREADS_LIBRARY)
+        TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${FFTW_THREADS_LIBRARY})
+    ENDIF (FFTW_THREADS_LIBRARY)
+    SET_TARGET_PROPERTIES(${STATIC_TARGET} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DOPENMM_PME_BUILDING_STATIC_LIBRARY")
+
+    INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${STATIC_TARGET})
+ENDIF(OPENMM_BUILD_STATIC_LIB)
+
 SUBDIRS(tests)

plugins/cpupme/src/CpuPmeKernelFactory.cpp

@@ -32,9 +32,6 @@
 
 using namespace OpenMM;
 
-extern "C" OPENMM_EXPORT_PME void registerPlatforms() {
-}
-
 extern "C" OPENMM_EXPORT_PME void registerKernelFactories() {
     if (CpuCalcPmeReciprocalForceKernel::isProcessorSupported()) {
         CpuPmeKernelFactory* factory = new CpuPmeKernelFactory();
@@ -43,9 +40,17 @@ extern "C" OPENMM_EXPORT_PME void registerKernelFactories() {
     }
 }
 
+#ifdef OPENMM_PME_BUILDING_STATIC_LIBRARY
+extern "C" void registerCpuPmeKernelFactories() {
+    registerKernelFactories();
+}
+#else
 extern "C" OPENMM_EXPORT_PME void registerCpuPmeKernelFactories() {
     registerKernelFactories();
 }
+extern "C" OPENMM_EXPORT_PME void registerPlatforms() {
+}
+#endif
 
 KernelImpl* CpuPmeKernelFactory::createKernelImpl(std::string name, const Platform& platform, ContextImpl& context) const {
     if (name == CalcPmeReciprocalForceKernel::Name())