Moving some files for CMake

CMakeLists.txt

@@ -108,11 +108,6 @@ IF ( NOT ONLY_BUILD_DOCS )
     ENDIF()
     INSTALL_LBPM_TARGET( lbpm-wia )
     ADD_SUBDIRECTORY( tests )
-    #IF ( USE_CUDA )
-    #    ADD_SUBDIRECTORY( gpu/exe )
-    #ELSE()
-    #    ADD_SUBDIRECTORY( cpu/exe )
-    #ENDIF()
     INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/example DESTINATION ${LBPM_INSTALL_DIR} )
 ENDIF()
 

tests/CMakeLists.txt

@@ -14,3 +14,11 @@ SET_TESTS_PROPERTIES( hello_world_2procs PROPERTIES ENVIRONMENT "MPICH_RDMA_ENAB
 SET_TESTS_PROPERTIES( hello_world_4procs PROPERTIES ENVIRONMENT "MPICH_RDMA_ENABLED_CUDA=0")
 
 
+# Add CPU/GPU specific test
+IF ( USE_CUDA )
+    ADD_SUBDIRECTORY( gpu )
+ELSE()
+    ADD_SUBDIRECTORY( cpu )
+ENDIF()
+
+

tests/cpu/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Add tests/executables that need to be compiled but not run
+INSTALL_LBPM_EXE( lb2_Color_wia_mpi )
+
+
+# Run the serial ConstrainedBubble inputs as a weekly test
+CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Color.in ${CMAKE_CURRENT_BINARY_DIR}/Color.in COPYONLY )
+CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Domain.in ${CMAKE_CURRENT_BINARY_DIR}/Domain.in COPYONLY )
+ADD_LBPM_WEEKLY_TEST( lb2_Color_wia_mpi 1 )
+
+

tests/gpu/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Add tests/executables that need to be compiled but not run
+INSTALL_LBPM_EXE( lb2_Color_wia_mpi )
+
+
+# Run the serial ConstrainedBubble inputs as a weekly test
+CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Color.in ${CMAKE_CURRENT_BINARY_DIR}/Color.in COPYONLY )
+CONFIGURE_FILE( ${LBPM_SOURCE_DIR}/example/ConstrainedBubble/Domain.in ${CMAKE_CURRENT_BINARY_DIR}/Domain.in COPYONLY )
+ADD_LBPM_WEEKLY_TEST( lb2_Color_wia_mpi 1 )