Merge pull request #10 from arcaneframework/dev/sdc-plug-app-build-sy…

…stem-submodule Update build-system
arcaneframework · Nov 29, 2023 · d4c5d03 · d4c5d03
2 parents 3ccbdd6 + 9e0a8e6
commit d4c5d03
Show file tree

Hide file tree

Showing 377 changed files with 17 additions and 93,949 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common/ArcaneInfra/build-system"]
+	path = common/ArcaneInfra/build-system
+	url = https://github.com/arcaneframework/app_buildsystem_tools.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,9 +6,16 @@ project(ShArc VERSION 0.1)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/common/ArcaneInfra/build-system/arcgeosim)
 set(USE_LANGUAGE_GUMP ON)
 set(USE_LANGUAGE_LAW ON)
-
-message(status "Arcane_DIR : ${Arcane_DIR}")
-
+set(ARCGEOSIM_FRAMEWORK_ROOT ${PROJECT_SOURCE_DIR}/common)
+set(ARCGEOSIM_FRAMEWORK_BINARY_DIR ${PROJECT_BINARY_DIR}/common)
+
+# check submodule is loaded
+if (NOT EXISTS ${PROJECT_SOURCE_DIR}/common/ArcaneInfra/build-system/arcgeosim/LoadArcGeoSim.cmake)
+    message(FATAL_ERROR "build-system not found, to update build-system submodule run the following command: "
+            "\n   cd ${CMAKE_CURRENT_SOURCE_DIR}"
+            "\n   git submodule update --init"
+    )
+endif ()
 # chargement du système de compilation
 include(LoadArcGeoSim)
 

diff --git a/common/ArcaneInfra/build-system b/common/ArcaneInfra/build-system
diff --git a/common/ArcaneInfra/build-system/README.md b/common/ArcaneInfra/build-system/README.md
diff --git a/common/ArcaneInfra/build-system/alien/AlienLegacyConfig.h.in b/common/ArcaneInfra/build-system/alien/AlienLegacyConfig.h.in
diff --git a/common/ArcaneInfra/build-system/alien/LoadAlienLegacyConfigFile.cmake b/common/ArcaneInfra/build-system/alien/LoadAlienLegacyConfigFile.cmake
diff --git a/common/ArcaneInfra/build-system/alien/LoadAlienOptions.cmake b/common/ArcaneInfra/build-system/alien/LoadAlienOptions.cmake
diff --git a/common/ArcaneInfra/build-system/alien/LoadAlienPackages.cmake b/common/ArcaneInfra/build-system/alien/LoadAlienPackages.cmake