Minor changes to CMakeLists.txt files for examples.

CMakeLists.txt

@@ -53,8 +53,6 @@ ENDIF(${CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT})
 
 INCLUDE(Dart)
 
-SUBDIRS (tests examples)
-
 # 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 . openmmapi olla libraries/jama libraries/quern libraries/lepton platforms/reference)
@@ -318,3 +316,5 @@ ENDIF (EXECUTABLE_OUTPUT_PATH)
 
 INCLUDE(ApiDoxygen.cmake)
 
+ADD_SUBDIRECTORY(tests)
+ADD_SUBDIRECTORY(examples)

examples/CMakeLists.txt

@@ -50,6 +50,8 @@ FOREACH(EX_ROOT ${CPP_EXAMPLES})
 
 ENDFOREACH(EX_ROOT ${CPP_EXAMPLES})
 
+INCLUDE_DIRECTORIES(BEFORE ${PROJECT_BINARY_DIR}/wrappers)
+
 FOREACH(EX_ROOT ${C_EXAMPLES})
     IF (BUILD_TESTING_SHARED)
         # Link with shared library
@@ -60,6 +62,7 @@ FOREACH(EX_ROOT ${C_EXAMPLES})
 		PROPERTIES
 	      PROJECT_LABEL "Example C - ${EX_ROOT}")
         TARGET_LINK_LIBRARIES(${EX_ROOT} ${SHARED_TARGET})
+		ADD_DEPENDENCIES(${EX_ROOT} ApiWrappers)
     ENDIF (BUILD_TESTING_SHARED)
 
     IF (BUILD_TESTING_STATIC)
@@ -73,6 +76,7 @@ FOREACH(EX_ROOT ${C_EXAMPLES})
 		COMPILE_FLAGS "-DOPENMM_USE_STATIC_LIBRARIES"
 		PROJECT_LABEL "Example C - ${EX_STATIC}")
         TARGET_LINK_LIBRARIES(${EX_STATIC} ${STATIC_TARGET})
+		ADD_DEPENDENCIES(${EX_STATIC} ApiWrappers)
     ENDIF (BUILD_TESTING_STATIC)
 
     INSTALL(FILES ${EX_ROOT}.c DESTINATION examples)