Cleanup CMake

tobanteAudio · Jul 9, 2024 · 07818f9 · 07818f9
1 parent 266b72a
commit 07818f9
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,33 +12,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 option(PFFDTD_ENABLE_SYCL "Build with sycl" OFF)
 
-add_executable(pffdtd)
-target_compile_definitions(pffdtd PRIVATE PRECISION=2 USING_CUDA=0)
-target_sources(pffdtd
-    PRIVATE
-        src/native/cpu_engine.cpp
-        src/native/cpu_engine.hpp
-        src/native/fdtd_common.cpp
-        src/native/fdtd_common.hpp
-        src/native/fdtd_data.cpp
-        src/native/fdtd_data.hpp
-        src/native/helper_funcs.cpp
-        src/native/helper_funcs.hpp
-        src/native/main.cpp
-)
-
 find_package(HDF5 REQUIRED)
-target_link_libraries(pffdtd PRIVATE HDF5::HDF5)
-
 find_package(OpenMP REQUIRED)
-target_link_libraries(pffdtd PRIVATE OpenMP::OpenMP_CXX)
 
-if((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") OR (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC"))
-    target_compile_options(pffdtd PRIVATE /W4)
-else ()
-    target_compile_options(pffdtd PRIVATE -Wno-deprecated-declarations)
-endif ()
+add_subdirectory(src/3D)
 
 if(PFFDTD_ENABLE_SYCL)
+    find_package(IntelSYCL REQUIRED)
     add_subdirectory(src/2D)
 endif()
diff --git a/src/2D/CMakeLists.txt b/src/2D/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(pffdtd_2d)
 
-find_package(IntelSYCL REQUIRED)
-
 add_executable(pffdtd_2d)
 target_sources(pffdtd_2d PRIVATE fdtd.cpp)
 add_sycl_to_target(TARGET pffdtd_2d SOURCES fdtd.cpp)

diff --git a/src/3D/CMakeLists.txt b/src/3D/CMakeLists.txt
@@ -0,0 +1,26 @@
+project(pffdtd_3d)
+
+add_executable(pffdtd_3d)
+target_compile_definitions(pffdtd_3d PRIVATE PRECISION=2 USING_CUDA=0)
+target_sources(pffdtd_3d
+    PRIVATE
+        cpu_engine.cpp
+        cpu_engine.hpp
+        fdtd_common.cpp
+        fdtd_common.hpp
+        fdtd_data.cpp
+        fdtd_data.hpp
+        helper_funcs.cpp
+        helper_funcs.hpp
+        main.cpp
+)
+
+
+target_link_libraries(pffdtd_3d PRIVATE HDF5::HDF5)
+target_link_libraries(pffdtd_3d PRIVATE OpenMP::OpenMP_CXX)
+
+if((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") OR (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC"))
+    target_compile_options(pffdtd_3d PRIVATE /W4)
+else ()
+    target_compile_options(pffdtd_3d PRIVATE -Wno-deprecated-declarations)
+endif ()
diff --git a/src/native/Makefile → src/3D/Makefile b/src/native/Makefile → src/3D/Makefile
diff --git a/src/native/cpu_engine.cpp → src/3D/cpu_engine.cpp b/src/native/cpu_engine.cpp → src/3D/cpu_engine.cpp
diff --git a/src/native/cpu_engine.hpp → src/3D/cpu_engine.hpp b/src/native/cpu_engine.hpp → src/3D/cpu_engine.hpp
diff --git a/src/native/fdtd_common.cpp → src/3D/fdtd_common.cpp b/src/native/fdtd_common.cpp → src/3D/fdtd_common.cpp
diff --git a/src/native/fdtd_common.hpp → src/3D/fdtd_common.hpp b/src/native/fdtd_common.hpp → src/3D/fdtd_common.hpp
diff --git a/src/native/fdtd_data.cpp → src/3D/fdtd_data.cpp b/src/native/fdtd_data.cpp → src/3D/fdtd_data.cpp
diff --git a/src/native/fdtd_data.hpp → src/3D/fdtd_data.hpp b/src/native/fdtd_data.hpp → src/3D/fdtd_data.hpp
diff --git a/src/native/gpu_engine.hpp → src/3D/gpu_engine.hpp b/src/native/gpu_engine.hpp → src/3D/gpu_engine.hpp
diff --git a/src/native/helper_funcs.cpp → src/3D/helper_funcs.cpp b/src/native/helper_funcs.cpp → src/3D/helper_funcs.cpp
diff --git a/src/native/helper_funcs.hpp → src/3D/helper_funcs.hpp b/src/native/helper_funcs.hpp → src/3D/helper_funcs.hpp
diff --git a/src/native/main.cpp → src/3D/main.cpp b/src/native/main.cpp → src/3D/main.cpp