Updated module build files for revised cmake-project templates

feabhas · Oct 15, 2024 · 99435e7 · 99435e7
1 parent 36b2fad
commit 99435e7
Show file tree

Hide file tree

Showing 41 changed files with 119 additions and 241 deletions.
diff --git a/examples/13_modules/CMakeLists.txt b/examples/13_modules/CMakeLists.txt
@@ -32,25 +32,40 @@ add_compile_definitions(
 )
 
 # TODO: uncomment the following target modules directive when
-# working with modules
+# working with example modules
 
 # add_library(modules OBJECT 
 #   src/MeasurementType.ixx 
 #   src/Measurement.ixx
 #   src/Measurements.ixx
 # )
 
+# add_library(modules OBJECT 
+#   src/alarm.ixx
+#   src/constraints.ixx
+#   src/templates.ixx
+# )
+
+# add_library(modules OBJECT 
+#   src/morning.ixx
+#   src/evening.ixx
+# )
+
 # add_library(modules OBJECT 
 #   src/alarm-base.ixx
 #   src/alarm-helper.ixx
 #   src/alarm-extra.ixx
 #   src/alarm.ixx
 # )
 
-add_library(modules OBJECT 
-  src/alarm.ixx
-  src/handler.ixx
-)
+# add_library(modules OBJECT 
+#   src/alarm.ixx
+#   src/handler.ixx
+# )
+
+# add_library(modules OBJECT 
+#   src/greet.ixx
+# )
 
 if (TARGET modules)
   target_include_directories(modules PRIVATE

diff --git a/examples/13_modules/alarm-partitions/CMakeLists.txt b/examples/13_modules/alarm-partitions/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.21)
+project(target-system LANGUAGES C CXX)
+
+add_library(modules OBJECT 
+  ${PROJECT_SOURCE_DIR}/alarm-base.ixx
+  ${PROJECT_SOURCE_DIR}/alarm-helper.ixx
+  ${PROJECT_SOURCE_DIR}/alarm-extra.ixx
+  ${PROJECT_SOURCE_DIR}/alarm.ixx
+)
+
+target_include_directories(modules PRIVATE
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/include
+)
+
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  target_compile_options(modules PRIVATE
+    -xc++
+  )
+endif()
diff --git a/...dules/src-alarm-partitions/alarm-base.cpp → ...3_modules/alarm-partitions/alarm-base.cpp b/...dules/src-alarm-partitions/alarm-base.cpp → ...3_modules/alarm-partitions/alarm-base.cpp
diff --git a/...dules/src-alarm-partitions/alarm-base.ixx → ...3_modules/alarm-partitions/alarm-base.ixx b/...dules/src-alarm-partitions/alarm-base.ixx → ...3_modules/alarm-partitions/alarm-base.ixx
diff --git a/...ules/src-alarm-partitions/alarm-extra.cpp → ..._modules/alarm-partitions/alarm-extra.cpp b/...ules/src-alarm-partitions/alarm-extra.cpp → ..._modules/alarm-partitions/alarm-extra.cpp
diff --git a/...ules/src-alarm-partitions/alarm-extra.ixx → ..._modules/alarm-partitions/alarm-extra.ixx b/...ules/src-alarm-partitions/alarm-extra.ixx → ..._modules/alarm-partitions/alarm-extra.ixx
diff --git a/...les/src-alarm-partitions/alarm-helper.cpp → ...modules/alarm-partitions/alarm-helper.cpp b/...les/src-alarm-partitions/alarm-helper.cpp → ...modules/alarm-partitions/alarm-helper.cpp
diff --git a/...les/src-alarm-partitions/alarm-helper.ixx → ...modules/alarm-partitions/alarm-helper.ixx b/...les/src-alarm-partitions/alarm-helper.ixx → ...modules/alarm-partitions/alarm-helper.ixx
diff --git a/...13_modules/src-alarm-partitions/alarm.ixx → ...les/13_modules/alarm-partitions/alarm.ixx b/...13_modules/src-alarm-partitions/alarm.ixx → ...les/13_modules/alarm-partitions/alarm.ixx
diff --git a/.../13_modules/src-alarm-partitions/main.cpp → ...ples/13_modules/alarm-partitions/main.cpp b/.../13_modules/src-alarm-partitions/main.cpp → ...ples/13_modules/alarm-partitions/main.cpp
diff --git a/examples/13_modules/alarm/CMakeLists.txt b/examples/13_modules/alarm/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.21)
+project(target-system LANGUAGES C CXX)
+
+add_library(modules OBJECT 
+  ${PROJECT_SOURCE_DIR}/alarm.ixx
+  ${PROJECT_SOURCE_DIR}/handler.ixx
+)
+
+target_include_directories(modules PRIVATE
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/include
+)
+
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  target_compile_options(modules PRIVATE
+    -xc++
+  )
+endif()
diff --git a/...ples/13_modules/cmake-alarm/src/alarm.cpp → examples/13_modules/alarm/alarm.cpp b/...ples/13_modules/cmake-alarm/src/alarm.cpp → examples/13_modules/alarm/alarm.cpp
diff --git a/...ples/13_modules/cmake-alarm/src/alarm.ixx → examples/13_modules/alarm/alarm.ixx b/...ples/13_modules/cmake-alarm/src/alarm.ixx → examples/13_modules/alarm/alarm.ixx
diff --git a/...es/13_modules/cmake-alarm/src/handler.cpp → examples/13_modules/alarm/handler.cpp b/...es/13_modules/cmake-alarm/src/handler.cpp → examples/13_modules/alarm/handler.cpp
diff --git a/...es/13_modules/cmake-alarm/src/handler.ixx → examples/13_modules/alarm/handler.ixx b/...es/13_modules/cmake-alarm/src/handler.ixx → examples/13_modules/alarm/handler.ixx
diff --git a/examples/13_modules/cmake-alarm/src/main.cpp → examples/13_modules/alarm/main.cpp b/examples/13_modules/cmake-alarm/src/main.cpp → examples/13_modules/alarm/main.cpp
diff --git a/examples/13_modules/cmake-alarm/CMakeLists.txt b/examples/13_modules/cmake-alarm/CMakeLists.txt
diff --git a/examples/13_modules/cmake-alarm/CMakePresets.json b/examples/13_modules/cmake-alarm/CMakePresets.json
diff --git a/examples/13_modules/greet/CMakeLists.txt b/examples/13_modules/greet/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.21)
+project(target-system LANGUAGES C CXX)
+
+add_library(modules OBJECT 
+  ${PROJECT_SOURCE_DIR}/greet.ixx
+)
+
+target_include_directories(modules PRIVATE
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/include
+)
+
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  target_compile_options(modules PRIVATE
+    -xc++
+  )
+endif()
diff --git a/examples/13_modules/src-greet/greet.cpp → examples/13_modules/greet/greet.cpp b/examples/13_modules/src-greet/greet.cpp → examples/13_modules/greet/greet.cpp
diff --git a/examples/13_modules/src-greet/greet.ixx → examples/13_modules/greet/greet.ixx b/examples/13_modules/src-greet/greet.ixx → examples/13_modules/greet/greet.ixx
diff --git a/examples/13_modules/src-greet/main.cpp → examples/13_modules/greet/main.cpp b/examples/13_modules/src-greet/main.cpp → examples/13_modules/greet/main.cpp
diff --git a/examples/13_modules/morning/CMakeLists.txt b/examples/13_modules/morning/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.21)
+project(target-system LANGUAGES C CXX)
+
+add_library(modules OBJECT 
+  ${PROJECT_SOURCE_DIR}/morning.ixx
+  ${PROJECT_SOURCE_DIR}/evening.ixx
+)
+
+target_include_directories(modules PRIVATE
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/include
+)
+
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  target_compile_options(modules PRIVATE
+    -xc++
+  )
+endif()
diff --git a/examples/13_modules/src-morning/evening.ixx → examples/13_modules/morning/evening.ixx b/examples/13_modules/src-morning/evening.ixx → examples/13_modules/morning/evening.ixx
diff --git a/examples/13_modules/src-morning/main.cpp → examples/13_modules/morning/main.cpp b/examples/13_modules/src-morning/main.cpp → examples/13_modules/morning/main.cpp
diff --git a/examples/13_modules/src-morning/morning.ixx → examples/13_modules/morning/morning.ixx b/examples/13_modules/src-morning/morning.ixx → examples/13_modules/morning/morning.ixx
diff --git a/examples/13_modules/src-alarm-partitions/Modules.txt b/examples/13_modules/src-alarm-partitions/Modules.txt
diff --git a/examples/13_modules/src-alarm/Modules.txt b/examples/13_modules/src-alarm/Modules.txt
diff --git a/examples/13_modules/src-alarm/alarm.cpp b/examples/13_modules/src-alarm/alarm.cpp
diff --git a/examples/13_modules/src-alarm/alarm.ixx b/examples/13_modules/src-alarm/alarm.ixx
diff --git a/examples/13_modules/src-alarm/handler.cpp b/examples/13_modules/src-alarm/handler.cpp
diff --git a/examples/13_modules/src-alarm/handler.ixx b/examples/13_modules/src-alarm/handler.ixx
diff --git a/examples/13_modules/src-alarm/main.cpp b/examples/13_modules/src-alarm/main.cpp
diff --git a/examples/13_modules/templates/CMakeLists.txt b/examples/13_modules/templates/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.21)
+project(target-system LANGUAGES C CXX)
+
+add_library(modules OBJECT 
+  ${PROJECT_SOURCE_DIR}/alarm.ixx
+  ${PROJECT_SOURCE_DIR}/constraints.ixx
+  ${PROJECT_SOURCE_DIR}/templates.ixx
+)
+
+target_include_directories(modules PRIVATE
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/include
+)
+
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+  target_compile_options(modules PRIVATE
+    -xc++
+  )
+endif()
diff --git a/...ples/13_modules/src-templates/Modules.txt → examples/13_modules/templates/Modules.txt b/...ples/13_modules/src-templates/Modules.txt → examples/13_modules/templates/Modules.txt
diff --git a/examples/13_modules/src-templates/alarm.cpp → examples/13_modules/templates/alarm.cpp b/examples/13_modules/src-templates/alarm.cpp → examples/13_modules/templates/alarm.cpp
diff --git a/examples/13_modules/src-templates/alarm.ixx → examples/13_modules/templates/alarm.ixx b/examples/13_modules/src-templates/alarm.ixx → examples/13_modules/templates/alarm.ixx
diff --git a/.../13_modules/src-templates/constraints.ixx → ...ples/13_modules/templates/constraints.ixx b/.../13_modules/src-templates/constraints.ixx → ...ples/13_modules/templates/constraints.ixx
diff --git a/examples/13_modules/src-templates/main.cpp → examples/13_modules/templates/main.cpp b/examples/13_modules/src-templates/main.cpp → examples/13_modules/templates/main.cpp
diff --git a/...es/13_modules/src-templates/templates.ixx → examples/13_modules/templates/templates.ixx b/...es/13_modules/src-templates/templates.ixx → examples/13_modules/templates/templates.ixx