Mods

platforms/brook/tests/CMakeLists.txt

-# # Testing
+#
+# Testing
 #
 
 ENABLE_TESTING()
@@ -19,7 +20,6 @@ ENDIF(LOG)
 
 INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../brook-cmake/FindBrook.cmake)
 
-# SET(BROOK_SRC ../src )
 SET(BROOK_LIB brook)
   
 SET(OpenMM_BROOK_LIBRARY_NAME OpenMM_Brook)
@@ -27,46 +27,30 @@ SET(OpenMM_BROOK_LIBRARY_NAME OpenMM_Brook)
 SET(SHARED_BROOK_TARGET ${OpenMM_BROOK_LIBRARY_NAME})
 SET(STATIC_BROOK_TARGET ${OpenMM_BROOK_LIBRARY_NAME}_static)
 
-# problem w/ brook.lib
-
-IF( UNIX AND CMAKE_BUILD_TYPE MATCHES Debug )
-   SET(SHARED_BROOK_TARGET ${SHARED_BROOK_TARGET}_d )
-   SET(STATIC_BROOK_TARGET ${STATIC_BROOK_TARGET}_d )
-   SET(BROOK_LIB           ${BROOK_LIB}_d )
-# ELSE(UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
-#   SET(BROOK_LIB           ${BROOK_LIB}_d )
-ENDIF (UNIX AND CMAKE_BUILD_TYPE MATCHES Debug)
-  
 # Automatically create tests using files named "Test*.cpp"
 FILE(GLOB TEST_PROGS "*Test*.cpp")
-
 FOREACH(TEST_PROG ${TEST_PROGS})
-
     GET_FILENAME_COMPONENT(TEST_ROOT ${TEST_PROG} NAME_WE)
 
     # Link with shared library
-#     ADD_EXECUTABLE(${TEST_ROOT} ${TEST_PROG})
-#     LINK_DIRECTORIES( ${TEST_ROOT} ${BROOK_SDK} )
-#     TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET} ${BROOK_LIB} )
-#     ADD_TEST(${TEST_ROOT} ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT})
-
-   # Link with static library
-   SET(TEST_STATIC ${TEST_ROOT}Static)
-   LINK_DIRECTORIES(${TEST_STATIC} ${BROOK_LIB_PATH})
+   #ADD_EXECUTABLE(${TEST_ROOT} ${TEST_PROG})
+   #TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET})
+   # ADD_TEST(${TEST_ROOT} ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT})
 
-   # STRING_APPEND( CMAKE_EXE_LINKER_FLAGS_DEBUG      "/NODEFAULTLIB:\"LIBCMT.lib\"")
-   SET( CMAKE_EXE_LINKER_FLAGS_DEBUG      "/NODEFAULTLIB:\"LIBCMT.lib\"")
-   # SET( CMAKE_EXE_LINKER_FLAGS            "/NODEFAULTLIB:\"LIBCMTD.lib\"")
+   SET( CMAKE_EXE_LINKER_FLAGS_DEBUG      "/NODEFAULTLIB:\"LIBCMTD.lib\"")
+#  SET( CMAKE_EXE_LINKER_FLAGS            "/NODEFAULTLIB:\"LIBCMT.lib\"")
 
-   ADD_EXECUTABLE(${TEST_STATIC} ${TEST_PROG})
    ADD_DEFINITIONS(-D_WIN32 )
 
-   SET_TARGET_PROPERTIES(${TEST_STATIC}
-                 PROPERTIES
-                 COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES"
-                 )
-
-   TARGET_LINK_LIBRARIES(${TEST_STATIC} ${STATIC_TARGET} ${STATIC_BROOK_TARGET} ${BROOK_LIB} )
+    # Link with static library
+    SET(TEST_STATIC ${TEST_ROOT}Static)
+    ADD_EXECUTABLE(${TEST_STATIC} ${TEST_PROG})
+#   SET_TARGET_PROPERTIES(${TEST_STATIC}
+#                PROPERTIES
+#                COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES"
+#                )
+   TARGET_LINK_LIBRARIES(${TEST_STATIC} ${STATIC_TARGET} ${STATIC_BROOK_TARGET} ${BROOK_LIB})
+   # ADD_TEST(${TEST_STATIC} ${EXECUTABLE_OUTPUT_PATH}/${TEST_STATIC})
 
    # ----------------------------------------------------------------------------
    IF(LOG)
@@ -74,7 +58,7 @@ FOREACH(TEST_PROG ${TEST_PROGS})
    ENDIF(LOG)
    # ----------------------------------------------------------------------------
 
-    ADD_TEST(${TEST_STATIC} ${EXECUTABLE_OUTPUT_PATH}/${TEST_STATIC})
+#  ADD_TEST(${TEST_STATIC} ${EXECUTABLE_OUTPUT_PATH}/${TEST_STATIC})
 
 ENDFOREACH(TEST_PROG ${TEST_PROGS})
 
@@ -84,5 +68,3 @@ IF(LOG)
    FILE( APPEND ${LOG_FILE} "Leaving Brook Test Cmake\n")
 ENDIF(LOG)
 
-# ----------------------------------------------------------------------------
-