Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
537912e4
Commit
537912e4
authored
Nov 26, 2013
by
peastman
Browse files
Include serialization classes directly in main library
parent
c63c2c0d
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
323 deletions
+15
-323
CMakeLists.txt
CMakeLists.txt
+4
-8
plugins/amoeba/CMakeLists.txt
plugins/amoeba/CMakeLists.txt
+4
-33
plugins/amoeba/serialization/CMakeLists.txt
plugins/amoeba/serialization/CMakeLists.txt
+0
-87
plugins/amoeba/serialization/tests/CMakeLists.txt
plugins/amoeba/serialization/tests/CMakeLists.txt
+1
-1
plugins/drude/CMakeLists.txt
plugins/drude/CMakeLists.txt
+4
-27
plugins/drude/serialization/CMakeLists.txt
plugins/drude/serialization/CMakeLists.txt
+0
-87
serialization/CMakeLists.txt
serialization/CMakeLists.txt
+1
-78
serialization/tests/CMakeLists.txt
serialization/tests/CMakeLists.txt
+1
-1
wrappers/python/setup.py
wrappers/python/setup.py
+0
-1
No files found.
CMakeLists.txt
View file @
537912e4
...
@@ -73,7 +73,7 @@ ENDIF(${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT})
...
@@ -73,7 +73,7 @@ ENDIF(${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT})
# The source is organized into subdirectories, but we handle them all from
# The source is organized into subdirectories, but we handle them all from
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
SET
(
OPENMM_SOURCE_SUBDIRS . openmmapi olla libraries/jama libraries/quern libraries/lepton libraries/sfmt libraries/lbfgs libraries/hilbert libraries/csha1 platforms/reference libraries/validate
)
SET
(
OPENMM_SOURCE_SUBDIRS . openmmapi olla libraries/jama libraries/quern libraries/lepton libraries/sfmt libraries/lbfgs libraries/hilbert libraries/csha1 platforms/reference
serialization
libraries/validate
)
IF
(
WIN32
)
IF
(
WIN32
)
SET
(
OPENMM_SOURCE_SUBDIRS
${
OPENMM_SOURCE_SUBDIRS
}
libraries/pthreads
)
SET
(
OPENMM_SOURCE_SUBDIRS
${
OPENMM_SOURCE_SUBDIRS
}
libraries/pthreads
)
ADD_CUSTOM_TARGET
(
PthreadsLibraries ALL
)
ADD_CUSTOM_TARGET
(
PthreadsLibraries ALL
)
...
@@ -429,18 +429,14 @@ INSTALL_FILES(/include/openmm/reference FILES ${REFERENCE_HEADERS})
...
@@ -429,18 +429,14 @@ INSTALL_FILES(/include/openmm/reference FILES ${REFERENCE_HEADERS})
# Serialization support
# Serialization support
SET
(
OPENMM_BUILD_SERIALIZATION_SUPPORT ON CACHE BOOL
"Whether to build the serialization support library"
)
ADD_SUBDIRECTORY
(
serialization
)
IF
(
OPENMM_BUILD_SERIALIZATION_SUPPORT
)
FILE
(
GLOB serialization_files
${
CMAKE_SOURCE_DIR
}
/serialization/src/*.cpp
)
ADD_SUBDIRECTORY
(
serialization
)
SET_SOURCE_FILES_PROPERTIES
(
${
serialization_files
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL -DIEEE_8087"
)
ENDIF
(
OPENMM_BUILD_SERIALIZATION_SUPPORT
)
# Python wrappers
# Python wrappers
SET
(
OPENMM_BUILD_PYTHON_WRAPPERS ON CACHE BOOL
"Build wrappers for Python"
)
SET
(
OPENMM_BUILD_PYTHON_WRAPPERS ON CACHE BOOL
"Build wrappers for Python"
)
IF
(
OPENMM_BUILD_PYTHON_WRAPPERS
)
IF
(
OPENMM_BUILD_PYTHON_WRAPPERS
)
IF
(
NOT OPENMM_BUILD_SERIALIZATION_SUPPORT
)
MESSAGE
(
SEND_ERROR
"The Python wrappers require that serialization support be built."
)
ENDIF
(
NOT OPENMM_BUILD_SERIALIZATION_SUPPORT
)
IF
(
NOT OPENMM_BUILD_AMOEBA_PLUGIN
)
IF
(
NOT OPENMM_BUILD_AMOEBA_PLUGIN
)
MESSAGE
(
SEND_ERROR
"The Python wrappers require that the AMOEBA plugin be built."
)
MESSAGE
(
SEND_ERROR
"The Python wrappers require that the AMOEBA plugin be built."
)
ENDIF
(
NOT OPENMM_BUILD_AMOEBA_PLUGIN
)
ENDIF
(
NOT OPENMM_BUILD_AMOEBA_PLUGIN
)
...
...
plugins/amoeba/CMakeLists.txt
View file @
537912e4
...
@@ -16,15 +16,9 @@
...
@@ -16,15 +16,9 @@
#INCLUDE(Dart)
#INCLUDE(Dart)
# ----------------------------------------------------------------------------
#SET(CREATE_SERIALIZABLE_OPENMM_AMOEBA OFF CACHE BOOL "Build verison of OpenMMAmoeba w/ backdoor serialization capability")
#SET(CREATE_SERIALIZABLE_OPENMM_AMOEBA TRUE )
SET
(
CREATE_SERIALIZABLE_OPENMM_AMOEBA FALSE
)
# ----------------------------------------------------------------------------
# The source is organized into subdirectories, but we handle them all from
# The source is organized into subdirectories, but we handle them all from
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
SET
(
OPENMM_AMOEBA_PLUGIN_SOURCE_SUBDIRS . openmmapi platforms/reference
)
SET
(
OPENMM_AMOEBA_PLUGIN_SOURCE_SUBDIRS . openmmapi platforms/reference
serialization
)
# Collect up information about the version of the OpenMM library we're building
# Collect up information about the version of the OpenMM library we're building
# and make it available to the code so it can be built into the binaries.
# and make it available to the code so it can be built into the binaries.
...
@@ -41,17 +35,11 @@ ADD_DEFINITIONS(-DOPENMM_AMOEBA_LIBRARY_NAME=${OPENMM_AMOEBA_LIBRARY_NAME}
...
@@ -41,17 +35,11 @@ ADD_DEFINITIONS(-DOPENMM_AMOEBA_LIBRARY_NAME=${OPENMM_AMOEBA_LIBRARY_NAME}
SET
(
SHARED_AMOEBA_TARGET
${
OPENMM_AMOEBA_LIBRARY_NAME
}
)
SET
(
SHARED_AMOEBA_TARGET
${
OPENMM_AMOEBA_LIBRARY_NAME
}
)
SET
(
STATIC_AMOEBA_TARGET
${
OPENMM_AMOEBA_LIBRARY_NAME
}
_static
)
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
# But on Unix or Cygwin we have to add the suffix manually
IF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
IF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
SET
(
SHARED_AMOEBA_TARGET
${
SHARED_AMOEBA_TARGET
}
_d
)
SET
(
SHARED_AMOEBA_TARGET
${
SHARED_AMOEBA_TARGET
}
_d
)
SET
(
STATIC_AMOEBA_TARGET
${
STATIC_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
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
# These are all the places to search for header files which are
# These are all the places to search for header files which are
...
@@ -113,11 +101,8 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
...
@@ -113,11 +101,8 @@ 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
}
)
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_AMOEBA_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY"
)
SET_TARGET_PROPERTIES
(
${
SHARED_AMOEBA_TARGET
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_AMOEBA_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY"
)
IF
(
CREATE_SERIALIZABLE_OPENMM_AMOEBA
)
FILE
(
GLOB serialization_files
${
CMAKE_CUURENT_SOURCE_DIR
}
/serialization/src/*.cpp
)
ADD_LIBRARY
(
${
SHARED_AMOEBA_SERIALIZABLE_TARGET
}
SHARED
${
SOURCE_AMOEBA_FILES
}
${
SOURCE_AMOEBA_INCLUDE_FILES
}
${
API_AMOEBA_ABS_INCLUDE_FILES
}
)
SET_SOURCE_FILES_PROPERTIES
(
${
serialization_files
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_AMOEBA_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL"
)
SET_TARGET_PROPERTIES
(
${
SHARED_AMOEBA_SERIALIZABLE_TARGET
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_AMOEBA_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
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
ADD_LIBRARY
(
${
STATIC_AMOEBA_TARGET
}
STATIC
${
SOURCE_AMOEBA_FILES
}
${
SOURCE_AMOEBA_INCLUDE_FILES
}
${
API_AMOEBA_ABS_INCLUDE_FILES
}
)
ADD_LIBRARY
(
${
STATIC_AMOEBA_TARGET
}
STATIC
${
SOURCE_AMOEBA_FILES
}
${
SOURCE_AMOEBA_INCLUDE_FILES
}
${
API_AMOEBA_ABS_INCLUDE_FILES
}
)
...
@@ -126,9 +111,6 @@ ENDIF(OPENMM_BUILD_STATIC_LIB)
...
@@ -126,9 +111,6 @@ ENDIF(OPENMM_BUILD_STATIC_LIB)
IF
(
OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS
)
IF
(
OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS
)
ADD_DEPENDENCIES
(
${
SHARED_AMOEBA_TARGET
}
AmoebaApiWrappers
)
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
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
ADD_DEPENDENCIES
(
${
STATIC_AMOEBA_TARGET
}
AmoebaApiWrappers
)
ADD_DEPENDENCIES
(
${
STATIC_AMOEBA_TARGET
}
AmoebaApiWrappers
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
...
@@ -140,9 +122,6 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
...
@@ -140,9 +122,6 @@ ENDIF(OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
FIND_LIBRARY
(
DL_LIBRARY dl
)
FIND_LIBRARY
(
DL_LIBRARY dl
)
IF
(
DL_LIBRARY
)
IF
(
DL_LIBRARY
)
TARGET_LINK_LIBRARIES
(
${
SHARED_AMOEBA_TARGET
}
${
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
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_AMOEBA_TARGET
}
${
DL_LIBRARY
}
)
TARGET_LINK_LIBRARIES
(
${
STATIC_AMOEBA_TARGET
}
${
DL_LIBRARY
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
...
@@ -155,9 +134,6 @@ IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
...
@@ -155,9 +134,6 @@ IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
TARGET_LINK_LIBRARIES
(
${
SHARED_AMOEBA_TARGET
}
${
SHARED_TARGET
}
)
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
)
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
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
...
@@ -186,9 +162,6 @@ ENDIF(OPENMM_BUILD_AMOEBA_CUDA_LIB)
...
@@ -186,9 +162,6 @@ ENDIF(OPENMM_BUILD_AMOEBA_CUDA_LIB)
#ENDIF(OPENMM_BUILD_OPENCL_LIB)
#ENDIF(OPENMM_BUILD_OPENCL_LIB)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
SHARED_AMOEBA_TARGET
}
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
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
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
STATIC_AMOEBA_TARGET
}
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
STATIC_AMOEBA_TARGET
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
...
@@ -223,9 +196,7 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
...
@@ -223,9 +196,7 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
SET
(
TEST_PATH .
)
SET
(
TEST_PATH .
)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
IF
(
OPENMM_BUILD_SERIALIZATION_SUPPORT
)
ADD_SUBDIRECTORY
(
serialization/tests
)
ADD_SUBDIRECTORY
(
serialization
)
ENDIF
(
OPENMM_BUILD_SERIALIZATION_SUPPORT
)
#INCLUDE(ApiDoxygen.cmake)
#INCLUDE(ApiDoxygen.cmake)
...
...
plugins/amoeba/serialization/CMakeLists.txt
deleted
100644 → 0
View file @
c63c2c0d
#---------------------------------------------------
# OpenMMAmoeba Serialization Library
#
# Creates OpenMMAmoeba serializatin library, base name=OpenMMAmoebaSerialization.
# Default libraries are shared & optimized. Variants
# are created for static (_static) and debug (_d).
#
# Windows:
# OpenMMAmoebaSerialization[_d].dll
# OpenMMAmoebaSerialization[_d].lib
# Unix:
# libOpenMMAmoebaSerialization[_d].so
#----------------------------------------------------
# The source is organized into subdirectories, but we handle them all from
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
SET
(
OPENMM_SOURCE_SUBDIRS . ../../../serialization
)
SET
(
OPENMM_AMOEBA_SOURCE_SUBDIRS .
)
# Collect up information about the version of the OpenMM library we're building
# and make it available to the code so it can be built into the binaries.
SET
(
OPENMM_AMOEBA_LIBRARY_NAME OpenMMAmoeba
)
SET
(
OPENMM_SERIALIZATION_LIBRARY_NAME OpenMMSerialization
)
SET
(
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME OpenMMAmoebaSerialization
)
# Ensure that debug libraries have "_d" appended to their names.
# CMake gets this right on Windows automatically with this definition.
IF
(
${
CMAKE_GENERATOR
}
MATCHES
"Visual Studio"
)
SET
(
CMAKE_DEBUG_POSTFIX
"_d"
CACHE INTERNAL
""
FORCE
)
ENDIF
(
${
CMAKE_GENERATOR
}
MATCHES
"Visual Studio"
)
# But on Unix or Cygwin we have to add the suffix manually
IF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
SET
(
OPENMM_AMOEBA_LIBRARY_NAME
${
OPENMM_AMOEBA_LIBRARY_NAME
}
_d
)
SET
(
OPENMM_SERIALIZATION_LIBRARY_NAME
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
_d
)
SET
(
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME
${
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME
}
_d
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
# These are all the places to search for header files which are
# to be part of the API.
SET
(
API_INCLUDE_DIRS
)
# start empty
FOREACH
(
subdir
${
OPENMM_SOURCE_SUBDIRS
}
)
# append
SET
(
API_INCLUDE_DIRS
${
API_INCLUDE_DIRS
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include/internal
)
ENDFOREACH
(
subdir
)
# We'll need both *relative* path names, starting with their API_INCLUDE_DIRS,
# and absolute pathnames.
SET
(
API_REL_INCLUDE_FILES
)
# start these out empty
SET
(
API_ABS_INCLUDE_FILES
)
FOREACH
(
dir
${
API_INCLUDE_DIRS
}
)
FILE
(
GLOB fullpaths
${
dir
}
/*.h
)
# returns full pathnames
SET
(
API_ABS_INCLUDE_FILES
${
API_ABS_INCLUDE_FILES
}
${
fullpaths
}
)
FOREACH
(
pathname
${
fullpaths
}
)
GET_FILENAME_COMPONENT
(
filename
${
pathname
}
NAME
)
SET
(
API_REL_INCLUDE_FILES
${
API_REL_INCLUDE_FILES
}
${
dir
}
/
${
filename
}
)
ENDFOREACH
(
pathname
)
ENDFOREACH
(
dir
)
# collect up source files
SET
(
SOURCE_FILES
)
# empty
SET
(
SOURCE_INCLUDE_FILES
)
FOREACH
(
subdir
${
OPENMM_AMOEBA_SOURCE_SUBDIRS
}
)
FILE
(
GLOB_RECURSE src_files
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.c
)
FILE
(
GLOB incl_files
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.h
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.hpp
)
SET
(
SOURCE_FILES
${
SOURCE_FILES
}
${
src_files
}
)
#append
SET
(
SOURCE_INCLUDE_FILES
${
SOURCE_INCLUDE_FILES
}
${
incl_files
}
)
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include
)
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../serialization/
${
subdir
}
/include
)
ENDFOREACH
(
subdir
)
#Message( "API_REL_INCLUDE_FILES=${API_REL_INCLUDE_FILES}\n" )
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/src
)
# Create the library
ADD_LIBRARY
(
${
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME
}
SHARED
${
SOURCE_FILES
}
${
SOURCE_INCLUDE_FILES
}
${
API_ABS_INCLUDE_FILES
}
)
TARGET_LINK_LIBRARIES
(
${
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME
}
${
OPENMM_AMOEBA_LIBRARY_NAME
}
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
${
SHARED_TARGET
}
)
SET_TARGET_PROPERTIES
(
${
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_AMOEBA_SERIALIZATION_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL -DIEEE_8087"
)
INSTALL_TARGETS
(
/lib/plugins RUNTIME_DIRECTORY /lib/plugins
${
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME
}
)
ADD_SUBDIRECTORY
(
tests
)
plugins/amoeba/serialization/tests/CMakeLists.txt
View file @
537912e4
...
@@ -11,7 +11,7 @@ FOREACH(TEST_PROG ${TEST_PROGS})
...
@@ -11,7 +11,7 @@ FOREACH(TEST_PROG ${TEST_PROGS})
# All tests use shared libraries
# All tests use shared libraries
ADD_EXECUTABLE
(
${
TEST_ROOT
}
${
TEST_PROG
}
)
ADD_EXECUTABLE
(
${
TEST_ROOT
}
${
TEST_PROG
}
)
TARGET_LINK_LIBRARIES
(
${
TEST_ROOT
}
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
${
OPENMM_AMOEBA_SERIALIZATION_LIBRARY_NAME
}
${
OPENMM_AMOEBA_LIBRARY_NAME
}
)
TARGET_LINK_LIBRARIES
(
${
TEST_ROOT
}
${
OPENMM_AMOEBA_LIBRARY_NAME
}
)
ADD_TEST
(
${
TEST_ROOT
}
${
EXECUTABLE_OUTPUT_PATH
}
/
${
TEST_ROOT
}
)
ADD_TEST
(
${
TEST_ROOT
}
${
EXECUTABLE_OUTPUT_PATH
}
/
${
TEST_ROOT
}
)
ENDFOREACH
(
TEST_PROG
${
TEST_PROGS
}
)
ENDFOREACH
(
TEST_PROG
${
TEST_PROGS
}
)
plugins/drude/CMakeLists.txt
View file @
537912e4
...
@@ -16,28 +16,18 @@
...
@@ -16,28 +16,18 @@
#INCLUDE(Dart)
#INCLUDE(Dart)
# ----------------------------------------------------------------------------
SET
(
CREATE_SERIALIZABLE_OPENMM_DRUDE FALSE
)
# ----------------------------------------------------------------------------
# The source is organized into subdirectories, but we handle them all from
# The source is organized into subdirectories, but we handle them all from
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
SET
(
OPENMM_DRUDE_PLUGIN_SOURCE_SUBDIRS . openmmapi platforms/reference
)
SET
(
OPENMM_DRUDE_PLUGIN_SOURCE_SUBDIRS . openmmapi platforms/reference
serialization
)
SET
(
OPENMM_DRUDE_LIBRARY_NAME OpenMMDrude
)
SET
(
OPENMM_DRUDE_LIBRARY_NAME OpenMMDrude
)
SET
(
SHARED_DRUDE_TARGET
${
OPENMM_DRUDE_LIBRARY_NAME
}
)
SET
(
SHARED_DRUDE_TARGET
${
OPENMM_DRUDE_LIBRARY_NAME
}
)
SET
(
STATIC_DRUDE_TARGET
${
OPENMM_DRUDE_LIBRARY_NAME
}
_static
)
SET
(
STATIC_DRUDE_TARGET
${
OPENMM_DRUDE_LIBRARY_NAME
}
_static
)
IF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
SET
(
SHARED_DRUDE_SERIALIZABLE_TARGET
${
OPENMM_DRUDE_LIBRARY_NAME
}
_serializable
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
# But on Unix or Cygwin we have to add the suffix manually
# But on Unix or Cygwin we have to add the suffix manually
IF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
IF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
SET
(
SHARED_DRUDE_TARGET
${
SHARED_DRUDE_TARGET
}
_d
)
SET
(
SHARED_DRUDE_TARGET
${
SHARED_DRUDE_TARGET
}
_d
)
SET
(
STATIC_DRUDE_TARGET
${
STATIC_DRUDE_TARGET
}
_d
)
SET
(
STATIC_DRUDE_TARGET
${
STATIC_DRUDE_TARGET
}
_d
)
IF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
SET
(
SHARED_DRUDE_SERIALIZABLE_TARGET
${
SHARED_DRUDE_SERIALIZABLE_TARGET
}
_d
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
# These are all the places to search for header files which are
# These are all the places to search for header files which are
...
@@ -99,11 +89,8 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
...
@@ -99,11 +89,8 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
ADD_LIBRARY
(
${
SHARED_DRUDE_TARGET
}
SHARED
${
SOURCE_DRUDE_FILES
}
${
SOURCE_DRUDE_INCLUDE_FILES
}
${
API_DRUDE_ABS_INCLUDE_FILES
}
)
ADD_LIBRARY
(
${
SHARED_DRUDE_TARGET
}
SHARED
${
SOURCE_DRUDE_FILES
}
${
SOURCE_DRUDE_INCLUDE_FILES
}
${
API_DRUDE_ABS_INCLUDE_FILES
}
)
SET_TARGET_PROPERTIES
(
${
SHARED_DRUDE_TARGET
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_DRUDE_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY"
)
SET_TARGET_PROPERTIES
(
${
SHARED_DRUDE_TARGET
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_DRUDE_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY"
)
#IF( CREATE_SERIALIZABLE_OPENMM_DRUDE )
FILE
(
GLOB serialization_files
${
CMAKE_CUURENT_SOURCE_DIR
}
/serialization/src/*.cpp
)
# ADD_LIBRARY(${SHARED_DRUDE_SERIALIZABLE_TARGET} SHARED ${SOURCE_DRUDE_FILES} ${SOURCE_DRUDE_INCLUDE_FILES} ${API_DRUDE_ABS_INCLUDE_FILES})
SET_SOURCE_FILES_PROPERTIES
(
${
serialization_files
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_DRUDE_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL"
)
# SET_TARGET_PROPERTIES(${SHARED_DRUDE_SERIALIZABLE_TARGET} PROPERTIES COMPILE_FLAGS "-DOPENMM_DRUDE_BUILDING_SHARED_LIBRARY -DLEPTON_BUILDING_SHARED_LIBRARY -DOPENMM_SERIALIZE")
# INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../../serialization/include)
#ENDIF( CREATE_SERIALIZABLE_OPENMM_DRUDE )
IF
(
OPENMM_BUILD_STATIC_LIB
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
ADD_LIBRARY
(
${
STATIC_DRUDE_TARGET
}
STATIC
${
SOURCE_DRUDE_FILES
}
${
SOURCE_DRUDE_INCLUDE_FILES
}
${
API_DRUDE_ABS_INCLUDE_FILES
}
)
ADD_LIBRARY
(
${
STATIC_DRUDE_TARGET
}
STATIC
${
SOURCE_DRUDE_FILES
}
${
SOURCE_DRUDE_INCLUDE_FILES
}
${
API_DRUDE_ABS_INCLUDE_FILES
}
)
...
@@ -141,9 +128,6 @@ IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
...
@@ -141,9 +128,6 @@ IF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
TARGET_LINK_LIBRARIES
(
${
SHARED_DRUDE_TARGET
}
${
SHARED_TARGET
}
)
TARGET_LINK_LIBRARIES
(
${
SHARED_DRUDE_TARGET
}
${
SHARED_TARGET
}
)
IF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
TARGET_LINK_LIBRARIES
(
${
SHARED_DRUDE_SERIALIZABLE_TARGET
}
${
SHARED_TARGET
}
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
TARGET_LINK_LIBRARIES
(
${
STATIC_DRUDE_TARGET
}
${
STATIC_TARGET
}
)
TARGET_LINK_LIBRARIES
(
${
STATIC_DRUDE_TARGET
}
${
STATIC_TARGET
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
...
@@ -180,9 +164,6 @@ IF(OPENMM_BUILD_DRUDE_CUDA_LIB)
...
@@ -180,9 +164,6 @@ IF(OPENMM_BUILD_DRUDE_CUDA_LIB)
ENDIF
(
OPENMM_BUILD_DRUDE_CUDA_LIB
)
ENDIF
(
OPENMM_BUILD_DRUDE_CUDA_LIB
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
SHARED_DRUDE_TARGET
}
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
SHARED_DRUDE_TARGET
}
)
IF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
INSTALL_TARGETS
(
/lib/plugins RUNTIME_DIRECTORY /lib/plugins
${
SHARED_DRUDE_SERIALIZABLE_TARGET
}
)
ENDIF
(
CREATE_SERIALIZABLE_OPENMM_DRUDE
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
STATIC_DRUDE_TARGET
}
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
STATIC_DRUDE_TARGET
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
...
@@ -205,10 +186,6 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
...
@@ -205,10 +186,6 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
SET
(
TEST_PATH .
)
SET
(
TEST_PATH .
)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
IF
(
OPENMM_BUILD_SERIALIZATION_SUPPORT
)
ADD_SUBDIRECTORY
(
serialization
)
ENDIF
(
OPENMM_BUILD_SERIALIZATION_SUPPORT
)
#INCLUDE(ApiDoxygen.cmake)
#INCLUDE(ApiDoxygen.cmake)
#
ADD_SUBDIRECTORY(tests)
ADD_SUBDIRECTORY
(
serialization/
tests
)
plugins/drude/serialization/CMakeLists.txt
deleted
100644 → 0
View file @
c63c2c0d
#---------------------------------------------------
# OpenMMDrude Serialization Library
#
# Creates OpenMMDrude serializatin library, base name=OpenMMDrudeSerialization.
# Default libraries are shared & optimized. Variants
# are created for static (_static) and debug (_d).
#
# Windows:
# OpenMMDrudeSerialization[_d].dll
# OpenMMDrudeSerialization[_d].lib
# Unix:
# libOpenMMDrudeSerialization[_d].so
#----------------------------------------------------
# The source is organized into subdirectories, but we handle them all from
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
SET
(
OPENMM_SOURCE_SUBDIRS . ../../../serialization
)
SET
(
OPENMM_DRUDE_SOURCE_SUBDIRS .
)
# Collect up information about the version of the OpenMM library we're building
# and make it available to the code so it can be built into the binaries.
SET
(
OPENMM_DRUDE_LIBRARY_NAME OpenMMDrude
)
SET
(
OPENMM_SERIALIZATION_LIBRARY_NAME OpenMMSerialization
)
SET
(
OPENMM_DRUDE_SERIALIZATION_LIBRARY_NAME OpenMMDrudeSerialization
)
# Ensure that debug libraries have "_d" appended to their names.
# CMake gets this right on Windows automatically with this definition.
IF
(
${
CMAKE_GENERATOR
}
MATCHES
"Visual Studio"
)
SET
(
CMAKE_DEBUG_POSTFIX
"_d"
CACHE INTERNAL
""
FORCE
)
ENDIF
(
${
CMAKE_GENERATOR
}
MATCHES
"Visual Studio"
)
# But on Unix or Cygwin we have to add the suffix manually
IF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
SET
(
OPENMM_DRUDE_LIBRARY_NAME
${
OPENMM_DRUDE_LIBRARY_NAME
}
_d
)
SET
(
OPENMM_SERIALIZATION_LIBRARY_NAME
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
_d
)
SET
(
OPENMM_DRUDE_SERIALIZATION_LIBRARY_NAME
${
OPENMM_DRUDE_SERIALIZATION_LIBRARY_NAME
}
_d
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
# These are all the places to search for header files which are
# to be part of the API.
SET
(
API_INCLUDE_DIRS
)
# start empty
FOREACH
(
subdir
${
OPENMM_SOURCE_SUBDIRS
}
)
# append
SET
(
API_INCLUDE_DIRS
${
API_INCLUDE_DIRS
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include/internal
)
ENDFOREACH
(
subdir
)
# We'll need both *relative* path names, starting with their API_INCLUDE_DIRS,
# and absolute pathnames.
SET
(
API_REL_INCLUDE_FILES
)
# start these out empty
SET
(
API_ABS_INCLUDE_FILES
)
FOREACH
(
dir
${
API_INCLUDE_DIRS
}
)
FILE
(
GLOB fullpaths
${
dir
}
/*.h
)
# returns full pathnames
SET
(
API_ABS_INCLUDE_FILES
${
API_ABS_INCLUDE_FILES
}
${
fullpaths
}
)
FOREACH
(
pathname
${
fullpaths
}
)
GET_FILENAME_COMPONENT
(
filename
${
pathname
}
NAME
)
SET
(
API_REL_INCLUDE_FILES
${
API_REL_INCLUDE_FILES
}
${
dir
}
/
${
filename
}
)
ENDFOREACH
(
pathname
)
ENDFOREACH
(
dir
)
# collect up source files
SET
(
SOURCE_FILES
)
# empty
SET
(
SOURCE_INCLUDE_FILES
)
FOREACH
(
subdir
${
OPENMM_DRUDE_SOURCE_SUBDIRS
}
)
FILE
(
GLOB_RECURSE src_files
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.c
)
FILE
(
GLOB incl_files
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.h
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.hpp
)
SET
(
SOURCE_FILES
${
SOURCE_FILES
}
${
src_files
}
)
#append
SET
(
SOURCE_INCLUDE_FILES
${
SOURCE_INCLUDE_FILES
}
${
incl_files
}
)
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include
)
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../serialization/
${
subdir
}
/include
)
ENDFOREACH
(
subdir
)
#Message( "API_REL_INCLUDE_FILES=${API_REL_INCLUDE_FILES}\n" )
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/src
)
# Create the library
ADD_LIBRARY
(
${
OPENMM_DRUDE_SERIALIZATION_LIBRARY_NAME
}
SHARED
${
SOURCE_FILES
}
${
SOURCE_INCLUDE_FILES
}
${
API_ABS_INCLUDE_FILES
}
)
TARGET_LINK_LIBRARIES
(
${
OPENMM_DRUDE_SERIALIZATION_LIBRARY_NAME
}
${
OPENMM_DRUDE_LIBRARY_NAME
}
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
${
SHARED_TARGET
}
)
SET_TARGET_PROPERTIES
(
${
OPENMM_DRUDE_SERIALIZATION_LIBRARY_NAME
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_DRUDE_SERIALIZATION_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL -DIEEE_8087"
)
INSTALL_TARGETS
(
/lib/plugins RUNTIME_DIRECTORY /lib/plugins
${
OPENMM_DRUDE_SERIALIZATION_LIBRARY_NAME
}
)
ADD_SUBDIRECTORY
(
tests
)
serialization/CMakeLists.txt
View file @
537912e4
#---------------------------------------------------
#---------------------------------------------------
# OpenMM Serialization Library
# OpenMM Serialization Classes
#
# Creates OpenMM serializatin library, base name=OpenMMSerialization.
# Default libraries are shared & optimized. Variants
# are created for static (_static) and debug (_d).
#
# Windows:
# OpenMMSerialization[_d].dll
# OpenMMSerialization[_d].lib
# Unix:
# libOpenMMSerialization[_d].so
#----------------------------------------------------
#----------------------------------------------------
# The source is organized into subdirectories, but we handle them all from
# this CMakeLists file rather than letting CMake visit them as SUBDIRS.
SET
(
OPENMM_SOURCE_SUBDIRS .
)
# Collect up information about the version of the OpenMM library we're building
# and make it available to the code so it can be built into the binaries.
SET
(
OPENMM_SERIALIZATION_LIBRARY_NAME OpenMMSerialization
)
# Ensure that debug libraries have "_d" appended to their names.
# CMake gets this right on Windows automatically with this definition.
IF
(
${
CMAKE_GENERATOR
}
MATCHES
"Visual Studio"
)
SET
(
CMAKE_DEBUG_POSTFIX
"_d"
CACHE INTERNAL
""
FORCE
)
ENDIF
(
${
CMAKE_GENERATOR
}
MATCHES
"Visual Studio"
)
# But on Unix or Cygwin we have to add the suffix manually
IF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
SET
(
OPENMM_SERIALIZATION_LIBRARY_NAME
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
_d
)
ENDIF
(
UNIX AND CMAKE_BUILD_TYPE MATCHES Debug
)
# These are all the places to search for header files which are
# to be part of the API.
SET
(
API_INCLUDE_DIRS
)
# start empty
FOREACH
(
subdir
${
OPENMM_SOURCE_SUBDIRS
}
)
# append
SET
(
API_INCLUDE_DIRS
${
API_INCLUDE_DIRS
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include/internal
)
ENDFOREACH
(
subdir
)
# We'll need both *relative* path names, starting with their API_INCLUDE_DIRS,
# and absolute pathnames.
SET
(
API_REL_INCLUDE_FILES
)
# start these out empty
SET
(
API_ABS_INCLUDE_FILES
)
FOREACH
(
dir
${
API_INCLUDE_DIRS
}
)
FILE
(
GLOB fullpaths
${
dir
}
/*.h
)
# returns full pathnames
SET
(
API_ABS_INCLUDE_FILES
${
API_ABS_INCLUDE_FILES
}
${
fullpaths
}
)
FOREACH
(
pathname
${
fullpaths
}
)
GET_FILENAME_COMPONENT
(
filename
${
pathname
}
NAME
)
SET
(
API_REL_INCLUDE_FILES
${
API_REL_INCLUDE_FILES
}
${
dir
}
/
${
filename
}
)
ENDFOREACH
(
pathname
)
ENDFOREACH
(
dir
)
# collect up source files
SET
(
SOURCE_FILES
)
# empty
SET
(
SOURCE_INCLUDE_FILES
)
FOREACH
(
subdir
${
OPENMM_SOURCE_SUBDIRS
}
)
FILE
(
GLOB_RECURSE src_files
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.cpp
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.c
)
FILE
(
GLOB incl_files
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.h
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/src/*.hpp
)
SET
(
SOURCE_FILES
${
SOURCE_FILES
}
${
src_files
}
)
#append
SET
(
SOURCE_INCLUDE_FILES
${
SOURCE_INCLUDE_FILES
}
${
incl_files
}
)
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
subdir
}
/include
)
ENDFOREACH
(
subdir
)
INCLUDE_DIRECTORIES
(
BEFORE
${
CMAKE_CURRENT_SOURCE_DIR
}
/src
)
# Create the library
ADD_LIBRARY
(
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
SHARED
${
SOURCE_FILES
}
${
SOURCE_INCLUDE_FILES
}
${
API_ABS_INCLUDE_FILES
}
)
TARGET_LINK_LIBRARIES
(
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
${
SHARED_TARGET
}
)
SET_TARGET_PROPERTIES
(
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
PROPERTIES COMPILE_FLAGS
"-DOPENMM_BUILDING_SHARED_LIBRARY -DTIXML_USE_STL -DIEEE_8087"
)
INSTALL_TARGETS
(
/lib RUNTIME_DIRECTORY /lib
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
)
INSTALL_FILES
(
/include/openmm/serialization FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/openmm/serialization/SerializationNode.h
)
INSTALL_FILES
(
/include/openmm/serialization FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/openmm/serialization/SerializationNode.h
)
INSTALL_FILES
(
/include/openmm/serialization FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/openmm/serialization/SerializationProxy.h
)
INSTALL_FILES
(
/include/openmm/serialization FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/openmm/serialization/SerializationProxy.h
)
INSTALL_FILES
(
/include/openmm/serialization FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/openmm/serialization/XmlSerializer.h
)
INSTALL_FILES
(
/include/openmm/serialization FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/include/openmm/serialization/XmlSerializer.h
)
...
...
serialization/tests/CMakeLists.txt
View file @
537912e4
...
@@ -11,7 +11,7 @@ FOREACH(TEST_PROG ${TEST_PROGS})
...
@@ -11,7 +11,7 @@ FOREACH(TEST_PROG ${TEST_PROGS})
# All tests use shared libraries
# All tests use shared libraries
ADD_EXECUTABLE
(
${
TEST_ROOT
}
${
TEST_PROG
}
)
ADD_EXECUTABLE
(
${
TEST_ROOT
}
${
TEST_PROG
}
)
TARGET_LINK_LIBRARIES
(
${
TEST_ROOT
}
${
OPENMM_SERIALIZATION_LIBRARY_NAME
}
)
TARGET_LINK_LIBRARIES
(
${
TEST_ROOT
}
${
SHARED_TARGET
}
)
ADD_TEST
(
${
TEST_ROOT
}
${
EXECUTABLE_OUTPUT_PATH
}
/
${
TEST_ROOT
}
)
ADD_TEST
(
${
TEST_ROOT
}
${
EXECUTABLE_OUTPUT_PATH
}
/
${
TEST_ROOT
}
)
ENDFOREACH
(
TEST_PROG
${
TEST_PROGS
}
)
ENDFOREACH
(
TEST_PROG
${
TEST_PROGS
}
)
wrappers/python/setup.py
View file @
537912e4
...
@@ -166,7 +166,6 @@ def buildKeywordDictionary(major_version_num=MAJOR_VERSION_NUM,
...
@@ -166,7 +166,6 @@ def buildKeywordDictionary(major_version_num=MAJOR_VERSION_NUM,
(
'MINOR_VERSION'
,
minor_version_num
)]
(
'MINOR_VERSION'
,
minor_version_num
)]
libraries
=
[
'OpenMM'
,
libraries
=
[
'OpenMM'
,
'OpenMMSerialization'
,
'OpenMMAmoeba'
,
'OpenMMAmoeba'
,
'OpenMMRPMD'
,
'OpenMMRPMD'
,
'OpenMMDrude'
,
'OpenMMDrude'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
