Move wrappers into examples directory to make it easier to build them.

examples/CMakeLists.txt

@@ -13,21 +13,20 @@
 # versions of the executable.
 
 
-SET(OpenMM_CWRAPPER_LIB "OpenMM_CWrapper")
+SET(OpenMM_CWRAPPER "OpenMM_CWrapper")
+SET(OpenMM_FMODULE  "OpenMM_Module")
 
-ADD_SUBDIRECTORY(wrappers)
+SET(CPP_EXAMPLES HelloArgon HelloSodiumChloride HelloEthane HelloWaterBox)
+SET(C_EXAMPLES HelloArgonInC HelloSodiumChlorideInC)
+SET(F_EXAMPLES HelloArgonInFortran HelloSodiumChlorideInFortran)
 
 SET(BUILD_TESTING_SHARED 1)
 SET(BUILD_TESTING_STATIC 1)
 
-FILE(GLOB EXAMPLES "*.cpp")
-FOREACH(EX_PROG ${EXAMPLES})
-    GET_FILENAME_COMPONENT(EX_SRC  ${EX_PROG} NAME)
-    GET_FILENAME_COMPONENT(EX_ROOT ${EX_PROG} NAME_WE)
-
+FOREACH(EX_ROOT ${CPP_EXAMPLES})
     IF (BUILD_TESTING_SHARED)
         # Link with shared library
-        ADD_EXECUTABLE(${EX_ROOT} ${EX_PROG})
+        ADD_EXECUTABLE(${EX_ROOT} ${EX_ROOT}.cpp)
         SET_TARGET_PROPERTIES(${EX_ROOT}
 		PROPERTIES
 	      PROJECT_LABEL "Example - ${EX_ROOT}")
@@ -37,7 +36,7 @@ FOREACH(EX_PROG ${EXAMPLES})
     IF (BUILD_TESTING_STATIC)
         # Link with static library
         SET(EX_STATIC ${EX_ROOT}Static)
-        ADD_EXECUTABLE(${EX_STATIC} ${EX_PROG})
+        ADD_EXECUTABLE(${EX_STATIC} ${EX_ROOT}.cpp)
         SET_TARGET_PROPERTIES(${EX_STATIC}
 		PROPERTIES
 		COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES"
@@ -45,39 +44,41 @@ FOREACH(EX_PROG ${EXAMPLES})
         TARGET_LINK_LIBRARIES(${EX_STATIC} ${STATIC_TARGET})
     ENDIF (BUILD_TESTING_STATIC)
 
-    INSTALL(FILES ${EX_SRC} DESTINATION examples)
-
-ENDFOREACH(EX_PROG ${ADHOC_TESTS})
+    INSTALL(FILES ${EX_ROOT}.cpp DESTINATION examples)
 
-FILE(GLOB EXAMPLES "*.c")
-FOREACH(EX_PROG ${EXAMPLES})
-    GET_FILENAME_COMPONENT(EX_SRC  ${EX_PROG} NAME)
-    GET_FILENAME_COMPONENT(EX_ROOT ${EX_PROG} NAME_WE)
+ENDFOREACH(EX_PROG ${CPP_EXAMPLES})
 
+FOREACH(EX_ROOT ${C_EXAMPLES})
     IF (BUILD_TESTING_SHARED)
         # Link with shared library
-        ADD_EXECUTABLE(${EX_ROOT} ${EX_PROG})
+        ADD_EXECUTABLE(${EX_ROOT} ${EX_ROOT}.c ${OpenMM_CWRAPPER}.cpp)
         SET_TARGET_PROPERTIES(${EX_ROOT}
 		PROPERTIES
 	      PROJECT_LABEL "Example C - ${EX_ROOT}")
-        TARGET_LINK_LIBRARIES(${EX_ROOT} 
-            ${OpenMM_CWRAPPER_LIB} ${SHARED_TARGET})
+        TARGET_LINK_LIBRARIES(${EX_ROOT} ${SHARED_TARGET})
     ENDIF (BUILD_TESTING_SHARED)
 
-#    IF (BUILD_TESTING_STATIC)
-#        # Link with static library
-#        SET(EX_STATIC ${EX_ROOT}Static)
-#        ADD_EXECUTABLE(${EX_STATIC} ${EX_PROG})
-#        SET_TARGET_PROPERTIES(${EX_STATIC}
-#		PROPERTIES
-#		COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES"
-#		PROJECT_LABEL "Example C - ${EX_STATIC}")
-#        TARGET_LINK_LIBRARIES(${EX_STATIC} 
-#		${OpenMM_CWRAPPER_LIB} ${STATIC_TARGET})
-#    ENDIF (BUILD_TESTING_STATIC)
+    IF (BUILD_TESTING_STATIC)
+        # Link with static library
+        SET(EX_STATIC ${EX_ROOT}Static)
+        ADD_EXECUTABLE(${EX_STATIC} ${EX_ROOT}.c ${OpenMM_CWRAPPER}.cpp)
+        SET_TARGET_PROPERTIES(${EX_STATIC}
+		PROPERTIES
+		COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES"
+		PROJECT_LABEL "Example C - ${EX_STATIC}")
+        TARGET_LINK_LIBRARIES(${EX_STATIC} ${STATIC_TARGET})
+    ENDIF (BUILD_TESTING_STATIC)
+
+    INSTALL(FILES ${EX_ROOT}.c DESTINATION examples)
+
+ENDFOREACH(EX_PROG ${C_EXAMPLES})
 
-    INSTALL(FILES ${EX_SRC} DESTINATION examples)
+FOREACH(EX_ROOT ${F_EXAMPLES})
+    INSTALL(FILES ${EX_ROOT}.f90 DESTINATION examples)
+ENDFOREACH(EX_PROG ${F_EXAMPLES})
 
-ENDFOREACH(EX_PROG ${ADHOC_TESTS})
+INSTALL(FILES ${OpenMM_CWRAPPER}.h ${OpenMM_CWRAPPER}.cpp DESTINATION examples)
+INSTALL(FILES ${OpenMM_FMODULE}.f90 DESTINATION examples)
 
-INSTALL(FILES README.txt DESTINATION examples)
\ No newline at end of file
+INSTALL(FILES README.txt DESTINATION examples)
+INSTALL(FILES Makefile DESTINATION examples)

examples/HelloArgonInC.c

@@ -11,7 +11,7 @@
  * other visualization tool to produce an animation of the resulting trajectory.
  * -------------------------------------------------------------------------- */
 
-#include "wrappers/OpenMM_CWrapper.h"
+#include "OpenMM_CWrapper.h"
 #include <stdio.h>
 
 /* Forward declaration of routine for printing one frame of the

examples/HelloSodiumChlorideInC.c

@@ -158,7 +158,7 @@ int main() {
  * can use the implementation from the C++ version of this example if you 
  * want. However, the methods are reimplemented in C below in case you prefer.
  */
-#include "wrappers/OpenMM_CWrapper.h"
+#include "OpenMM_CWrapper.h"
 
 
 struct MyOpenMMData_s {

examples/Makefile

@@ -17,7 +17,7 @@ FFLAGS = -g
 LIB_DIR=$(OpenMM_INSTALL_DIR)/lib
 INCLUDE_DIR=$(OpenMM_INSTALL_DIR)/include
 # assume local directory for C and Fortran wrappers
-WRAPPER_DIR=./wrappers
+WRAPPER_DIR=.
 LIBS= -lOpenMM$(DEBUG)
 
 ALL_CPP_EXAMPLES = HelloArgon HelloSodiumChloride HelloEthane HelloWaterBox