Remove install of SerializationNode.h SerializationProxy.h and XmlSerializer.h

Move install of AmoebaSerialization lib to plugin directory

plugins/amoeba/CMakeLists.txt

@@ -16,6 +16,8 @@
 
 #INCLUDE(Dart)
 
+# ----------------------------------------------------------------------------
+SET(CREATE_SERIALIZABLE_OPENMM_AMOEBA OFF CACHE BOOL "Build verison of OpenMMAmoeba w/ backdoor serialization capability")
 # ----------------------------------------------------------------------------
 
 # The source is organized into subdirectories, but we handle them all from
@@ -37,11 +39,17 @@ ADD_DEFINITIONS(-DOPENMM_AMOEBA_LIBRARY_NAME=${OPENMM_AMOEBA_LIBRARY_NAME}
 
 SET(SHARED_AMOEBA_TARGET ${OPENMM_AMOEBA_LIBRARY_NAME})
 SET(STATIC_AMOEBA_TARGET ${OPENMM_AMOEBA_LIBRARY_NAME}_static)
+IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+    SET(SHARED_AMOEBA_SERIALIZABLE_TARGET ${OPENMM_AMOEBA_LIBRARY_NAME}_serializable)
+ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
 
 # But on Unix or Cygwin we have to add the suffix manually
 IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
     SET(SHARED_AMOEBA_TARGET ${SHARED_AMOEBA_TARGET}_d)
     SET(STATIC_AMOEBA_TARGET ${STATIC_AMOEBA_TARGET}_d)
+    IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+        SET(SHARED_AMOEBA_SERIALIZABLE_TARGET ${SHARED_AMOEBA_SERIALIZABLE_TARGET}_d)
+    ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
 ENDIF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
 
 # These are all the places to search for header files which are
@@ -104,6 +112,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 ADD_LIBRARY(${SHARED_AMOEBA_TARGET} SHARED ${SOURCE_AMOEBA_FILES} ${SOURCE_AMOEBA_INCLUDE_FILES} ${API_AMOEBA_ABS_INCLUDE_FILES})
 SET_TARGET_PROPERTIES(${SHARED_AMOEBA_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY")
 
+IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+    ADD_LIBRARY(${SHARED_AMOEBA_SERIALIZABLE_TARGET} SHARED ${SOURCE_AMOEBA_FILES} ${SOURCE_AMOEBA_INCLUDE_FILES} ${API_AMOEBA_ABS_INCLUDE_FILES})
+    SET_TARGET_PROPERTIES(${SHARED_AMOEBA_SERIALIZABLE_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY -DOPENMM_SERIALIZE")
+    INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../serialization/include)
+ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+
 IF(OPENMM_BUILD_STATIC_LIB)
   ADD_LIBRARY(${STATIC_AMOEBA_TARGET} STATIC ${SOURCE_AMOEBA_FILES} ${SOURCE_AMOEBA_INCLUDE_FILES} ${API_AMOEBA_ABS_INCLUDE_FILES})
   SET_TARGET_PROPERTIES(${STATIC_AMOEBA_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES -DOPENMM_BUILDING_STATIC_LIBRARY -DLEPTON_USE_STATIC_LIBRARIES -DLEPTON_BUILDING_STATIC_LIBRARY")
@@ -111,6 +125,9 @@ ENDIF(OPENMM_BUILD_STATIC_LIB)
 
 IF(OPENMM_BUILD_API_WRAPPERS)
     ADD_DEPENDENCIES(${SHARED_AMOEBA_TARGET} AmoebaApiWrappers)
+    IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+        ADD_DEPENDENCIES(${SHARED_AMOEBA_SERIALIZABLE_TARGET} AmoebaApiWrappers)
+    ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
     IF(OPENMM_BUILD_STATIC_LIB)
         ADD_DEPENDENCIES(${STATIC_AMOEBA_TARGET} AmoebaApiWrappers)
     ENDIF(OPENMM_BUILD_STATIC_LIB)
@@ -122,6 +139,9 @@ ENDIF(OPENMM_BUILD_API_WRAPPERS)
 FIND_LIBRARY(DL_LIBRARY dl)
 IF(DL_LIBRARY)
   TARGET_LINK_LIBRARIES(${SHARED_AMOEBA_TARGET} ${DL_LIBRARY})
+  IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+      TARGET_LINK_LIBRARIES(${SHARED_AMOEBA_SERIALIZABLE_TARGET} ${DL_LIBRARY})
+  ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
   IF(OPENMM_BUILD_STATIC_LIB)
     TARGET_LINK_LIBRARIES(${STATIC_AMOEBA_TARGET} ${DL_LIBRARY})
   ENDIF(OPENMM_BUILD_STATIC_LIB)
@@ -132,9 +152,13 @@ SET( OpenMMLib OpenMM )
 IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
     SET(OpenMMLib ${OpenMMLib}_d)
 ENDIF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
+
 TARGET_LINK_LIBRARIES( ${SHARED_AMOEBA_TARGET} ${SHARED_TARGET} )
+IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+    TARGET_LINK_LIBRARIES( ${SHARED_AMOEBA_SERIALIZABLE_TARGET} ${SHARED_TARGET} )
+ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
 IF(OPENMM_BUILD_STATIC_LIB)
-  TARGET_LINK_LIBRARIES( ${STATIC_AMOEBA_TARGET} ${STATIC_TARGET} )
+    TARGET_LINK_LIBRARIES( ${STATIC_AMOEBA_TARGET} ${STATIC_TARGET} )
 ENDIF(OPENMM_BUILD_STATIC_LIB)
 
 ADD_SUBDIRECTORY(platforms/reference/tests)
@@ -160,9 +184,12 @@ ENDIF(OPENMM_BUILD_AMOEBA_CUDA_LIB)
 #    ADD_SUBDIRECTORY(platforms/opencl)
 #ENDIF(OPENMM_BUILD_OPENCL_LIB)
 
-INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib/plugins ${SHARED_AMOEBA_TARGET})
+INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_AMOEBA_TARGET})
+IF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
+    INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${SHARED_AMOEBA_SERIALIZABLE_TARGET})
+ENDIF( CREATE_SERIALIZABLE_OPENMM_AMOEBA )
 IF(OPENMM_BUILD_STATIC_LIB)
-  INSTALL_TARGETS(/lib RUNTIME_DIRECTORY /lib/plugins ${STATIC_AMOEBA_TARGET})
+  INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${STATIC_AMOEBA_TARGET})
 ENDIF(OPENMM_BUILD_STATIC_LIB)
 FILE(GLOB CORE_HEADERS     include/*.h          */include/*.h)
 FILE(GLOB TOP_HEADERS      include/openmm/*.h          */include/openmm/*.h)