Skip to content

Commit 67ad26b

Browse files
stdcmstdcm
authored
Merge pull request #1173 from arcaneframework/dev/sdc-change-alienarcaneinterface-cmake-project-name
Change alien/ArcaneInterface CMake project name.
2 parents e6fd566 + 3e94e96 commit 67ad26b

File tree

12 files changed

+19
-2
lines changed

12 files changed

+19
-2
lines changed

‎alien/ArcaneInterface/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ string(REPLACE "_dev" "" ALIEN_VERSION ${ALIEN_VERSION_STR_FULL})
1313
string(STRIP "${ALIEN_VERSION}" ALIEN_VERSION) # In case of \n
1414
message(STATUS "AlienLegacyVersion = ${ALIEN_VERSION}")
1515

16-
project(ALIEN
17-
VERSION ${ALIEN_VERSION}) # Le nom est important car les axl sont générés dans <PROJECT_NAME>/axl
16+
project(AlienPlugins
17+
VERSION ${ALIEN_VERSION})
1818

1919
# ----------------------------------------------------------------------------
2020
# ----------------------------------------------------------------------------

‎alien/ArcaneInterface/modules/external_packages/src/alien/kernels/hypre/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ generateAxl(alien_external_packages
1717
${IS_WITH_ARCANE}
1818
${IS_WITH_MESH}
1919
INSTALL_GENERATED_FILES
20+
USER_INSTALL_PREFIX ALIEN
2021
)
2122
endif()
2223

‎alien/ArcaneInterface/modules/external_packages/src/alien/kernels/mtl/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
${IS_WITH_ARCANE}
1818
${IS_WITH_MESH}
1919
INSTALL_GENERATED_FILES
20+
USER_INSTALL_PREFIX ALIEN
2021
)
2122
endif()
2223

‎alien/ArcaneInterface/modules/external_packages/src/alien/kernels/petsc/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
${IS_WITH_ARCANE}
4545
${IS_WITH_MESH}
4646
INSTALL_GENERATED_FILES
47+
USER_INSTALL_PREFIX ALIEN
4748
)
4849
endif()
4950
addSources(alien_external_packages
@@ -75,6 +76,7 @@
7576
${IS_WITH_ARCANE}
7677
${IS_WITH_MESH}
7778
INSTALL_GENERATED_FILES
79+
USER_INSTALL_PREFIX ALIEN
7880
)
7981
endif()
8082
addSources(alien_external_packages
@@ -94,6 +96,7 @@
9496
${IS_WITH_ARCANE}
9597
${IS_WITH_MESH}
9698
INSTALL_GENERATED_FILES
99+
USER_INSTALL_PREFIX ALIEN
97100
)
98101
endif()
99102
addSources(alien_external_packages
@@ -112,6 +115,7 @@
112115
${IS_WITH_ARCANE}
113116
${IS_WITH_MESH}
114117
INSTALL_GENERATED_FILES
118+
USER_INSTALL_PREFIX ALIEN
115119
)
116120
endif()
117121
addSources(alien_external_packages
@@ -130,6 +134,7 @@
130134
${IS_WITH_ARCANE}
131135
${IS_WITH_MESH}
132136
INSTALL_GENERATED_FILES
137+
USER_INSTALL_PREFIX ALIEN
133138
)
134139
endif()
135140
addSources(alien_external_packages

‎alien/ArcaneInterface/modules/hpddm/src/alien/kernels/hpddm/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ generateAxl(alien_hpddm
1111
${IS_WITH_ARCANE}
1212
${IS_WITH_MESH}
1313
INSTALL_GENERATED_FILES
14+
USER_INSTALL_PREFIX ALIEN
1415
)
1516
addSources(alien_hpddm
1617
linear_solver/arcane/HPDDMSolverService.cc

‎alien/ArcaneInterface/modules/ifpen_solvers/src/alien/kernels/hts/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ generateAxl(alien_ifpen_solvers
1717
${IS_WITH_ARCANE}
1818
${IS_WITH_MESH}
1919
INSTALL_GENERATED_FILES
20+
USER_INSTALL_PREFIX ALIEN
2021
)
2122
generateAxl(alien_ifpen_solvers
2223
eigen_solver/arcane/HTSEigenSolver.axl
@@ -25,6 +26,7 @@ generateAxl(alien_ifpen_solvers
2526
${IS_WITH_ARCANE}
2627
${IS_WITH_MESH}
2728
INSTALL_GENERATED_FILES
29+
USER_INSTALL_PREFIX ALIEN
2830
)
2931
addSources(alien_ifpen_solvers
3032
linear_solver/arcane/HTSLinearSolver.cc

‎alien/ArcaneInterface/modules/ifpen_solvers/src/alien/kernels/ifp/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ generateAxl(alien_ifpen_solvers
1717
${IS_WITH_ARCANE}
1818
${IS_WITH_MESH}
1919
INSTALL_GENERATED_FILES
20+
USER_INSTALL_PREFIX ALIEN
2021
)
2122

2223
addSources(alien_ifpen_solvers

‎alien/ArcaneInterface/modules/ifpen_solvers/src/alien/kernels/mcg/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ generateAxl(alien_ifpen_solvers
1515
${IS_WITH_ARCANE}
1616
${IS_WITH_MESH}
1717
INSTALL_GENERATED_FILES
18+
USER_INSTALL_PREFIX ALIEN
1819
)
1920

2021
addSources(alien_ifpen_solvers

‎alien/ArcaneInterface/modules/plugins/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ generateAxl(alien_plugins_solvers
1818
${IS_WITH_ARCANE}
1919
${IS_WITH_MESH}
2020
INSTALL_GENERATED_FILES
21+
USER_INSTALL_PREFIX ALIEN
2122
)
2223

2324
addSources(alien_plugins_solvers

‎alien/ArcaneInterface/modules/trilinos/src/alien/kernels/trilinos/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ generateAxl(alien_trilinos
1919
${IS_WITH_ARCANE}
2020
${IS_WITH_MESH}
2121
INSTALL_GENERATED_FILES
22+
USER_INSTALL_PREFIX ALIEN
2223
)
2324
generateAxl(alien_trilinos
2425
eigen_solver/arcane/TrilinosEigenSolver.axl
@@ -27,6 +28,7 @@ generateAxl(alien_trilinos
2728
${IS_WITH_ARCANE}
2829
${IS_WITH_MESH}
2930
INSTALL_GENERATED_FILES
31+
USER_INSTALL_PREFIX ALIEN
3032
)
3133
addSources(alien_trilinos
3234
linear_solver/arcane/TrilinosLinearSolver.cc

‎alien/ArcaneInterface/test/AlienBench/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ generateAxl(alien_bench.exe
1111
AlienBench.axl
1212
AlienStokes.axl
1313
NO_COPY
14+
USER_INSTALL_PREFIX ALIEN
1415
)
1516

1617
if (TARGET intel)

‎alien/ArcaneInterface/test/AlienTest/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ addSources(alien_arcane_test.exe
1111
generateAxl(alien_arcane_test.exe
1212
AlienTest.axl
1313
NO_COPY
14+
USER_INSTALL_PREFIX ALIEN
1415
)
1516

1617
# Les hooks pour les mallocs sont obsolètes et n'existent

0 commit comments

Comments
 (0)