Merge pull request #617 from Omegaice/master

Updated code to obey BUILD_TESTING to allow for disabling of test compilation

CMakeLists.txt

@@ -324,7 +324,9 @@ ELSE(DL_LIBRARY)
     ENDIF(OPENMM_BUILD_SHARED_LIB)
 ENDIF(DL_LIBRARY)
 
-ADD_SUBDIRECTORY(platforms/reference/tests)
+IF(BUILD_TESTING)
+    ADD_SUBDIRECTORY(platforms/reference/tests)
+ENDIF(BUILD_TESTING)
 
 # Which hardware platforms to build
 
@@ -506,7 +508,9 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
 ENDIF (EXECUTABLE_OUTPUT_PATH)
 
 ADD_SUBDIRECTORY(docs-source)
-ADD_SUBDIRECTORY(tests)
+IF(BUILD_TESTING)
+    ADD_SUBDIRECTORY(tests)
+ENDIF(BUILD_TESTING)
 ADD_SUBDIRECTORY(examples)
 
 ENDIF(NOT cmv EQUAL "2.4") # This whole file...

platforms/cpu/CMakeLists.txt

@@ -12,7 +12,9 @@
 #   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
 # this CMakeLists file rather than letting CMake visit them as SUBDIRS.
@@ -82,4 +84,3 @@ ENDIF(OPENMM_BUILD_SHARED_LIB)
 IF(OPENMM_BUILD_STATIC_LIB)
     SUBDIRS (staticTarget)
 ENDIF(OPENMM_BUILD_STATIC_LIB)
-

plugins/amoeba/CMakeLists.txt

@@ -162,4 +162,6 @@ ELSE (EXECUTABLE_OUTPUT_PATH)
   SET (TEST_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

@@ -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}")
 
 INSTALL(TARGETS ${SHARED_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/plugins)
-SUBDIRS (tests)
+
+IF(BUILD_TESTING)
+    SUBDIRS (tests)
+ENDIF(BUILD_TESTING)

plugins/cpupme/CMakeLists.txt

@@ -93,4 +93,6 @@ IF(OPENMM_BUILD_STATIC_LIB)
     INSTALL_TARGETS(/lib/plugins RUNTIME_DIRECTORY /lib/plugins ${STATIC_TARGET})
 ENDIF(OPENMM_BUILD_STATIC_LIB)
 
-SUBDIRS(tests)
+IF(BUILD_TESTING)
+    SUBDIRS(tests)
+ENDIF(BUILD_TESTING)

plugins/drude/CMakeLists.txt

@@ -145,4 +145,6 @@ ENDIF (EXECUTABLE_OUTPUT_PATH)
 
 #INCLUDE(ApiDoxygen.cmake)
 
-ADD_SUBDIRECTORY(serialization/tests)
+IF(BUILD_TESTING)
+    ADD_SUBDIRECTORY(serialization/tests)
+ENDIF(BUILD_TESTING)

plugins/drude/platforms/reference/CMakeLists.txt

@@ -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")
 
 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

@@ -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")
 
 INSTALL(TARGETS ${SHARED_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/plugins)
-SUBDIRS (tests)
+
+IF(BUILD_TESTING)
+    SUBDIRS (tests)
+ENDIF(BUILD_TESTING)

serialization/CMakeLists.txt

@@ -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/XmlSerializer.h)
 
-ADD_SUBDIRECTORY(tests)
+IF(BUILD_TESTING)
+    ADD_SUBDIRECTORY(tests)
+ENDIF(BUILD_TESTING)