Merge pull request #97 from arcaneframework/dev/gg-simplify-cmake-config

Load Arcane package in root file and remove sub-projects
arcaneframework · Jan 23, 2024 · ce847b1 · ce847b1
2 parents 55a76d9 + eb5f968
commit ce847b1
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 57 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,12 @@
 cmake_minimum_required(VERSION 3.21)
-project(FemTest1Main LANGUAGES NONE)
+project(ArcaneFem LANGUAGES C CXX)
+
+find_package(Arcane REQUIRED)
+
 enable_testing()
+
 set(MSH_DIR ${CMAKE_SOURCE_DIR}/meshes/msh)
+
 # Needed for dynamic loading of services
 set(BUILD_SHARED_LIBS TRUE)
 

diff --git a/aerodynamics/CMakeLists.txt b/aerodynamics/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(aerodynamics LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(aerodynamics
   FemModule.cc
   main.cc

diff --git a/elasticity/CMakeLists.txt b/elasticity/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(Elasticity LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(Elasticity
   FemModule.cc
   main.cc

diff --git a/elastodynamics/CMakeLists.txt b/elastodynamics/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(Elastodynamics LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(Elastodynamics
   FemModule.cc
   main.cc

diff --git a/electrostatics/CMakeLists.txt b/electrostatics/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(Electrostatics LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(Electrostatics
   FemModule.cc
   main.cc

diff --git a/femutils/CMakeLists.txt b/femutils/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(FemTest1 LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 option(ENABLE_DEBUG_MATRIX "Enable Debug matrix instead of a sparse one" OFF)
 
 add_library(FemUtils

diff --git a/fourier/CMakeLists.txt b/fourier/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(Fourier LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(Fourier
   FemModule.cc
   main.cc

diff --git a/heat/CMakeLists.txt b/heat/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(heat LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(heat
   FemModule.cc
   main.cc

diff --git a/laplace/CMakeLists.txt b/laplace/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(Laplace LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(Laplace
   FemModule.cc
   main.cc

diff --git a/passmo/CMakeLists.txt b/passmo/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-
-project(Passmo LANGUAGES C CXX)
-find_package(Arcane REQUIRED)
-
 add_executable(Passmo
   TypesElastodynamic.h
   Elastodynamic_axl.h

diff --git a/poisson/CMakeLists.txt b/poisson/CMakeLists.txt
@@ -1,9 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(Poisson LANGUAGES C CXX)
-#set(CMAKE_BUILD_TYPE Debug)
-
-find_package(Arcane REQUIRED)
-
 if (ARCANE_HAS_CUDA)
   find_library(CUSPARSE_LIB cusparse HINTS ${CUDA_TOOLKIT_ROOT_DIR}/lib64)
   if(CUSPARSE_LIB)

diff --git a/soildynamics/CMakeLists.txt b/soildynamics/CMakeLists.txt
@@ -1,8 +1,3 @@
-cmake_minimum_required(VERSION 3.21)
-project(Soildynamics LANGUAGES C CXX)
-
-find_package(Arcane REQUIRED)
-
 add_executable(Soildynamics
   FemModule.cc
   main.cc