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
1e67b2ef
Commit
1e67b2ef
authored
Sep 14, 2014
by
James Sweet
Browse files
Updated code to obey BUILD_TESTING to allow for disabling of test compilation
parent
db674874
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
33 additions
and
11 deletions
+33
-11
CMakeLists.txt
CMakeLists.txt
+6
-2
platforms/cpu/CMakeLists.txt
platforms/cpu/CMakeLists.txt
+3
-2
plugins/amoeba/CMakeLists.txt
plugins/amoeba/CMakeLists.txt
+3
-1
plugins/amoeba/platforms/reference/CMakeLists.txt
plugins/amoeba/platforms/reference/CMakeLists.txt
+4
-1
plugins/cpupme/CMakeLists.txt
plugins/cpupme/CMakeLists.txt
+3
-1
plugins/drude/CMakeLists.txt
plugins/drude/CMakeLists.txt
+3
-1
plugins/drude/platforms/reference/CMakeLists.txt
plugins/drude/platforms/reference/CMakeLists.txt
+4
-1
plugins/rpmd/platforms/reference/CMakeLists.txt
plugins/rpmd/platforms/reference/CMakeLists.txt
+4
-1
serialization/CMakeLists.txt
serialization/CMakeLists.txt
+3
-1
No files found.
CMakeLists.txt
View file @
1e67b2ef
...
@@ -324,7 +324,9 @@ ELSE(DL_LIBRARY)
...
@@ -324,7 +324,9 @@ ELSE(DL_LIBRARY)
ENDIF
(
OPENMM_BUILD_SHARED_LIB
)
ENDIF
(
OPENMM_BUILD_SHARED_LIB
)
ENDIF
(
DL_LIBRARY
)
ENDIF
(
DL_LIBRARY
)
ADD_SUBDIRECTORY
(
platforms/reference/tests
)
IF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
platforms/reference/tests
)
ENDIF
(
BUILD_TESTING
)
# Which hardware platforms to build
# Which hardware platforms to build
...
@@ -506,7 +508,9 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
...
@@ -506,7 +508,9 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
ADD_SUBDIRECTORY
(
docs-source
)
ADD_SUBDIRECTORY
(
docs-source
)
ADD_SUBDIRECTORY
(
tests
)
IF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
tests
)
ENDIF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
examples
)
ADD_SUBDIRECTORY
(
examples
)
ENDIF
(
NOT cmv EQUAL
"2.4"
)
# This whole file...
ENDIF
(
NOT cmv EQUAL
"2.4"
)
# This whole file...
platforms/cpu/CMakeLists.txt
View file @
1e67b2ef
...
@@ -12,7 +12,9 @@
...
@@ -12,7 +12,9 @@
# libOpenMMCPU_static.a
# libOpenMMCPU_static.a
#----------------------------------------------------
#----------------------------------------------------
SUBDIRS
(
tests
)
IF
(
BUILD_TESTING
)
SUBDIRS
(
tests
)
ENDIF
(
BUILD_TESTING
)
# 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.
...
@@ -82,4 +84,3 @@ ENDIF(OPENMM_BUILD_SHARED_LIB)
...
@@ -82,4 +84,3 @@ ENDIF(OPENMM_BUILD_SHARED_LIB)
IF
(
OPENMM_BUILD_STATIC_LIB
)
IF
(
OPENMM_BUILD_STATIC_LIB
)
SUBDIRS
(
staticTarget
)
SUBDIRS
(
staticTarget
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
plugins/amoeba/CMakeLists.txt
View file @
1e67b2ef
...
@@ -162,4 +162,6 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
...
@@ -162,4 +162,6 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
SET
(
TEST_PATH .
)
SET
(
TEST_PATH .
)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
ENDIF
(
EXECUTABLE_OUTPUT_PATH
)
ADD_SUBDIRECTORY
(
serialization/tests
)
IF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
serialization/tests
)
ENDIF
(
BUILD_TESTING
)
plugins/amoeba/platforms/reference/CMakeLists.txt
View file @
1e67b2ef
...
@@ -74,4 +74,7 @@ SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "${EXTRA_COMPILE
...
@@ -74,4 +74,7 @@ SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "${EXTRA_COMPILE
SET_TARGET_PROPERTIES
(
${
SHARED_TARGET
}
PROPERTIES LINK_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
"
)
SET_TARGET_PROPERTIES
(
${
SHARED_TARGET
}
PROPERTIES LINK_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
"
)
INSTALL
(
TARGETS
${
SHARED_TARGET
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/plugins
)
INSTALL
(
TARGETS
${
SHARED_TARGET
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/plugins
)
SUBDIRS
(
tests
)
IF
(
BUILD_TESTING
)
SUBDIRS
(
tests
)
ENDIF
(
BUILD_TESTING
)
plugins/cpupme/CMakeLists.txt
View file @
1e67b2ef
...
@@ -93,4 +93,6 @@ IF(OPENMM_BUILD_STATIC_LIB)
...
@@ -93,4 +93,6 @@ IF(OPENMM_BUILD_STATIC_LIB)
INSTALL_TARGETS
(
/lib/plugins RUNTIME_DIRECTORY /lib/plugins
${
STATIC_TARGET
}
)
INSTALL_TARGETS
(
/lib/plugins RUNTIME_DIRECTORY /lib/plugins
${
STATIC_TARGET
}
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
ENDIF
(
OPENMM_BUILD_STATIC_LIB
)
SUBDIRS
(
tests
)
IF
(
BUILD_TESTING
)
SUBDIRS
(
tests
)
ENDIF
(
BUILD_TESTING
)
plugins/drude/CMakeLists.txt
View file @
1e67b2ef
...
@@ -145,4 +145,6 @@ ENDIF (EXECUTABLE_OUTPUT_PATH)
...
@@ -145,4 +145,6 @@ ENDIF (EXECUTABLE_OUTPUT_PATH)
#INCLUDE(ApiDoxygen.cmake)
#INCLUDE(ApiDoxygen.cmake)
ADD_SUBDIRECTORY
(
serialization/tests
)
IF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
serialization/tests
)
ENDIF
(
BUILD_TESTING
)
plugins/drude/platforms/reference/CMakeLists.txt
View file @
1e67b2ef
...
@@ -74,4 +74,7 @@ TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${SHARED_DRUDE_TARGET} optimized ${
...
@@ -74,4 +74,7 @@ TARGET_LINK_LIBRARIES(${SHARED_TARGET} debug ${SHARED_DRUDE_TARGET} optimized ${
SET_TARGET_PROPERTIES
(
${
SHARED_TARGET
}
PROPERTIES LINK_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
"
COMPILE_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
-DOPENMM_BUILDING_SHARED_LIBRARY"
)
SET_TARGET_PROPERTIES
(
${
SHARED_TARGET
}
PROPERTIES LINK_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
"
COMPILE_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
-DOPENMM_BUILDING_SHARED_LIBRARY"
)
INSTALL
(
TARGETS
${
SHARED_TARGET
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/plugins
)
INSTALL
(
TARGETS
${
SHARED_TARGET
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/plugins
)
SUBDIRS
(
tests
)
IF
(
BUILD_TESTING
)
SUBDIRS
(
tests
)
ENDIF
(
BUILD_TESTING
)
plugins/rpmd/platforms/reference/CMakeLists.txt
View file @
1e67b2ef
...
@@ -74,4 +74,7 @@ TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${SHARED_RPMD_TARGET})
...
@@ -74,4 +74,7 @@ TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${SHARED_RPMD_TARGET})
SET_TARGET_PROPERTIES
(
${
SHARED_TARGET
}
PROPERTIES LINK_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
"
COMPILE_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
-DOPENMM_BUILDING_SHARED_LIBRARY"
)
SET_TARGET_PROPERTIES
(
${
SHARED_TARGET
}
PROPERTIES LINK_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
"
COMPILE_FLAGS
"
${
EXTRA_COMPILE_FLAGS
}
-DOPENMM_BUILDING_SHARED_LIBRARY"
)
INSTALL
(
TARGETS
${
SHARED_TARGET
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/plugins
)
INSTALL
(
TARGETS
${
SHARED_TARGET
}
DESTINATION
${
CMAKE_INSTALL_PREFIX
}
/lib/plugins
)
SUBDIRS
(
tests
)
IF
(
BUILD_TESTING
)
SUBDIRS
(
tests
)
ENDIF
(
BUILD_TESTING
)
serialization/CMakeLists.txt
View file @
1e67b2ef
...
@@ -6,4 +6,6 @@ INSTALL_FILES(/include/openmm/serialization FILES ${CMAKE_CURRENT_SOURCE_DIR}/in
...
@@ -6,4 +6,6 @@ INSTALL_FILES(/include/openmm/serialization FILES ${CMAKE_CURRENT_SOURCE_DIR}/in
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
)
ADD_SUBDIRECTORY
(
tests
)
IF
(
BUILD_TESTING
)
ADD_SUBDIRECTORY
(
tests
)
ENDIF
(
BUILD_TESTING
)
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