Copy mesh tpo demo dir with cmake

Wells-Group · Jun 8, 2024 · 84fd8e1 · 84fd8e1
1 parent ad6c248
commit 84fd8e1
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 8 deletions.
diff --git a/.github/workflows/test-app.yml b/.github/workflows/test-app.yml
@@ -98,7 +98,7 @@ jobs:
           ninja
           #
           ./meshtie/demo_meshtie
-          mpirun -np 2 .meshtie/demo_meshtie
+          mpirun -np 2 ./meshtie/demo_meshtie
           #
           ./meshtieHeatEquation/demo_meshtie_heat
           mpirun -np 2 ./meshtieHeatEquation/demo_meshtie_heat

diff --git a/cpp/demos/meshtie/CMakeLists.txt b/cpp/demos/meshtie/CMakeLists.txt
@@ -42,5 +42,17 @@ add_custom_command(
 
 add_executable(${PROJECT_NAME} main.cpp ${ufl_file}.c)
 
+# Copy mesh files into binary directory
+function(copy_meshes_to_target_dir target)
+  add_custom_command(
+        TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "$<TARGET_PROPERTY:${target},SOURCE_DIR>/../meshes"
+            "$<TARGET_PROPERTY:${target},BINARY_DIR>"
+    )
+endfunction()
+copy_meshes_to_target_dir(${PROJECT_NAME})
+
 target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
-target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx_contact)
+target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx_contact)
+
diff --git a/cpp/demos/meshtie/main.cpp b/cpp/demos/meshtie/main.cpp
@@ -37,7 +37,7 @@ int main(int argc, char* argv[])
   spdlog::set_pattern(fmt);
   {
     auto [mesh_init, domain1_init, facet1_init] = dolfinx_contact::read_mesh(
-        "../meshes/box_3D.xdmf", "mesh", "mesh", "cell_marker", "facet_marker");
+        "box_3D.xdmf", "mesh", "mesh", "cell_marker", "facet_marker");
 
     const std::int32_t contact_bdry_1 = 6;  // top contact interface
     const std::int32_t contact_bdry_2 = 13; // bottom contact interface

diff --git a/cpp/demos/meshtieHeatEquation/CMakeLists.txt b/cpp/demos/meshtieHeatEquation/CMakeLists.txt
@@ -30,5 +30,16 @@ add_custom_command(
 
 add_executable(${PROJECT_NAME} main.cpp ${ufl_file}.c)
 
+# Copy mesh files into binary directory
+function(copy_meshes_to_target_dir target)
+  add_custom_command(
+        TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "$<TARGET_PROPERTY:${target},SOURCE_DIR>/../meshes"
+            "$<TARGET_PROPERTY:${target},BINARY_DIR>"
+    )
+endfunction()
+copy_meshes_to_target_dir(${PROJECT_NAME})
+
 target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
 target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx_contact)
diff --git a/cpp/demos/meshtieHeatEquation/main.cpp b/cpp/demos/meshtieHeatEquation/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, char* argv[])
 
   {
     auto [mesh_init, domain1_init, facet1_init]
-        = dolfinx_contact::read_mesh("../meshes/cont-blocks_sk24_fnx.xdmf");
+        = dolfinx_contact::read_mesh("cont-blocks_sk24_fnx.xdmf");
 
     const std::int32_t contact_bdry_1 = 6;  // top contact interface
     const std::int32_t contact_bdry_2 = 12; // bottom contact interface

diff --git a/cpp/demos/meshtieHeatTransfer/CMakeLists.txt b/cpp/demos/meshtieHeatTransfer/CMakeLists.txt
@@ -27,8 +27,18 @@ add_custom_command(
   COMMENT "Compiling ${ufl_file}.py"
 )
 
-
 add_executable(${PROJECT_NAME} main.cpp ${ufl_file}.c)
 
+# Copy mesh files into binary directory
+function(copy_meshes_to_target_dir target)
+  add_custom_command(
+        TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "$<TARGET_PROPERTY:${target},SOURCE_DIR>/../meshes"
+            "$<TARGET_PROPERTY:${target},BINARY_DIR>"
+    )
+endfunction()
+copy_meshes_to_target_dir(${PROJECT_NAME})
+
 target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
 target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx_contact)
diff --git a/cpp/demos/meshtieHeatTransfer/main.cpp b/cpp/demos/meshtieHeatTransfer/main.cpp
@@ -231,7 +231,7 @@ int main(int argc, char* argv[])
 
     // Read in mesh
     auto [mesh_init, domain1_init, facet1_init]
-        = dolfinx_contact::read_mesh("../meshes/cont-blocks_sk24_fnx.xdmf");
+        = dolfinx_contact::read_mesh("cont-blocks_sk24_fnx.xdmf");
 
     // Add necessary ghosts
     const std::int32_t contact_bdry_1 = 12; // top contact interface

diff --git a/cpp/demos/meshtieNewton/CMakeLists.txt b/cpp/demos/meshtieNewton/CMakeLists.txt
@@ -27,8 +27,18 @@ add_custom_command(
   COMMENT "Compiling ${ufl_file}.py"
 )
 
-
 add_executable(${PROJECT_NAME} main.cpp ${ufl_file}.c)
 
+# Copy mesh files into binary directory
+function(copy_meshes_to_target_dir target)
+  add_custom_command(
+        TARGET ${target} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "$<TARGET_PROPERTY:${target},SOURCE_DIR>/../meshes"
+            "$<TARGET_PROPERTY:${target},BINARY_DIR>"
+    )
+endfunction()
+copy_meshes_to_target_dir(${PROJECT_NAME})
+
 target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx)
 target_link_libraries(${PROJECT_NAME} PRIVATE dolfinx_contact)
diff --git a/cpp/demos/meshtieNewton/main.cpp b/cpp/demos/meshtieNewton/main.cpp
@@ -216,7 +216,7 @@ int main(int argc, char* argv[])
   spdlog::set_pattern(fmt);
   {
     auto [mesh_init, domain1_init, facet1_init]
-        = dolfinx_contact::read_mesh("../meshes/cont-blocks_sk24_fnx.xdmf");
+        = dolfinx_contact::read_mesh("cont-blocks_sk24_fnx.xdmf");
 
     const std::int32_t contact_bdry_1 = 12; // top contact interface
     const std::int32_t contact_bdry_2 = 6;  // bottom contact interface