From c81b06dbf06908af9a0adf1bfded6841d1e08dcd Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 23 Jan 2024 16:20:18 +0100 Subject: [PATCH 1/2] Load Arcane package in root file and remove sub-projects This will improve loading time when configuration change. --- CMakeLists.txt | 7 ++++++- aerodynamics/CMakeLists.txt | 3 --- elasticity/CMakeLists.txt | 5 ----- elastodynamics/CMakeLists.txt | 5 ----- electrostatics/CMakeLists.txt | 5 ----- femutils/CMakeLists.txt | 5 ----- fourier/CMakeLists.txt | 5 ----- heat/CMakeLists.txt | 5 ----- laplace/CMakeLists.txt | 5 ----- passmo/CMakeLists.txt | 5 ----- poisson/CMakeLists.txt | 6 ------ soildynamics/CMakeLists.txt | 5 ----- 12 files changed, 6 insertions(+), 55 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e23cad1..126af200 100644 --- 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 index d2f9af93..c3a2229c 100644 --- a/aerodynamics/CMakeLists.txt +++ b/aerodynamics/CMakeLists.txt @@ -1,8 +1,5 @@ -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 index 4fc57627..0507196b 100644 --- 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 index 6a9929a1..dd101d67 100644 --- 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 index adaf4a53..49fa7fe5 100644 --- 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 index cec54428..9c8e74f7 100644 --- 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 index 77d68aac..734b3197 100644 --- 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 index 88921e1b..fa7ad9b3 100644 --- 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 index d524e902..6ad7e8c2 100644 --- 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 index dd888385..9ee52b99 100644 --- 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 index cf11b4d2..ac06795f 100644 --- 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 index cde3111e..cc2d0e55 100644 --- 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 From eb5f9684828ae7fd2d2a4f395565ed883c50e97d Mon Sep 17 00:00:00 2001 From: Gilles Grospellier Date: Tue, 23 Jan 2024 20:47:56 +0100 Subject: [PATCH 2/2] Remove useless 'project' command. --- aerodynamics/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/aerodynamics/CMakeLists.txt b/aerodynamics/CMakeLists.txt index c3a2229c..46598857 100644 --- a/aerodynamics/CMakeLists.txt +++ b/aerodynamics/CMakeLists.txt @@ -1,5 +1,3 @@ -project(aerodynamics LANGUAGES C CXX) - add_executable(aerodynamics FemModule.cc main.cc