Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
4cae4e9d
Commit
4cae4e9d
authored
1 week ago
by
Stéphane Del Pino
Browse files
Options
Downloads
Patches
Plain Diff
Fix installation and plugin generation for Almalinux
parent
db22fdf6
Branches
develop
No related tags found
No related merge requests found
Pipeline
#1964
passed
1 week ago
Stage: test
Stage: coverage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-0
4 additions, 0 deletions
CMakeLists.txt
tools/plugin-template/CMakeLists.txt-template
+19
-13
19 additions, 13 deletions
tools/plugin-template/CMakeLists.txt-template
with
23 additions
and
13 deletions
CMakeLists.txt
+
4
−
0
View file @
4cae4e9d
...
@@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.19)
...
@@ -3,6 +3,10 @@ cmake_minimum_required (VERSION 3.19)
# CMake utils
# CMake utils
list
(
APPEND CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
list
(
APPEND CMAKE_MODULE_PATH
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake"
)
set
(
CMAKE_INSTALL_LIBDIR
"lib"
)
set
(
CMAKE_INSTALL_INCLUDEDIR
"include"
)
set
(
CMAKE_INSTALL_BINDIR
"bin"
)
# Forbids in-source builds
# Forbids in-source builds
include
(
CheckNotInSources
)
include
(
CheckNotInSources
)
...
...
This diff is collapsed.
Click to expand it.
tools/plugin-template/CMakeLists.txt-template
+
19
−
13
View file @
4cae4e9d
...
@@ -23,14 +23,21 @@ find_package(Pugs REQUIRED)
...
@@ -23,14 +23,21 @@ find_package(Pugs REQUIRED)
list(APPEND CMAKE_MODULE_PATH "${PUGS_PREFIX_PATH}/lib/cmake/Kokkos")
list(APPEND CMAKE_MODULE_PATH "${PUGS_PREFIX_PATH}/lib/cmake/Kokkos")
include(KokkosConfig)
include(KokkosConfig)
set(HDF5_PREFER_PARALLEL TRUE)
list(APPEND CMAKE_MODULE_PATH "${PUGS_PREFIX_PATH}/lib/cmake/HighFive")
include(HighFiveConfig)
list(APPEND CMAKE_MODULE_PATH "${PUGS_PREFIX_PATH}/lib/cmake/pugs")
list(APPEND CMAKE_MODULE_PATH "${PUGS_PREFIX_PATH}/lib/cmake/pugs")
include(PugsTargets)
include(PugsCompileFlags)
include(PugsCompileFlags)
if (${PUGS_HAS_MPI})
set(HDF5_PREFER_PARALLEL TRUE)
list(APPEND CMAKE_MODULE_PATH "${PUGS_PREFIX_PATH}/lib/cmake/HighFive")
include(HighFiveConfig)
if (TARGET HighFive)
set(HIGHFIVE_TARGET HighFive::HighFive)
endif()
endif()
include(PugsTargets)
#------------------------------------------------------
#------------------------------------------------------
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PUGS_CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PUGS_CMAKE_CXX_FLAGS}")
...
@@ -77,16 +84,11 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
...
@@ -77,16 +84,11 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
include_directories(SYSTEM "${PUGS_PREFIX_PATH}/include")
include_directories(SYSTEM "${PUGS_PREFIX_PATH}/include")
include_directories(SYSTEM "${PUGS_PREFIX_PATH}/include/kokkos")
include_directories(SYSTEM "${PUGS_PREFIX_PATH}/include/kokkos")
include_directories(SYSTEM "${PUGS_PREFIX_PATH}/include/tao/")
include_directories(SYSTEM "${PUGS_PREFIX_PATH}/include/tao/")
if (${PUGS_HAS_MPI})
include_directories(SYSTEM "${MPI_CXX_INCLUDE_DIRS}")
include_directories(SYSTEM "${MPI_CXX_INCLUDE_DIRS}")
endif()
get_target_property(_prop Pugs::PugsAlgebra INTERFACE_INCLUDE_DIRECTORIES)
include_directories(SYSTEM "${PUGS_PREFIX_PATH}/include")
set(PUGS_INC_DIR "${PUGS_INC_DIR};${_prop}")
get_target_property(_prop Pugs::PugsUtils INTERFACE_INCLUDE_DIRECTORIES)
set(PUGS_INC_DIR "${PUGS_INC_DIR};${_prop}")
get_target_property(_prop Pugs::pugs INTERFACE_INCLUDE_DIRECTORIES)
set(PUGS_INC_DIR "${PUGS_INC_DIR};${_prop}")
include_directories(SYSTEM ${PUGS_INC_DIR})
link_directories(${PUGS_PREFIX_PATH}/lib)
link_directories(${PUGS_PREFIX_PATH}/lib)
#------------------------------------------------------
#------------------------------------------------------
...
@@ -143,6 +145,10 @@ add_library(_PLUGIN_NAME_
...
@@ -143,6 +145,10 @@ add_library(_PLUGIN_NAME_
# add cpp sources files here
# add cpp sources files here
)
)
target_link_libraries(_PLUGIN_NAME_
${HIGHFIVE_TARGET}
)
#------------------------------------------------------
#------------------------------------------------------
add_subdirectory(tests)
add_subdirectory(tests)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment