Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openfa
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Monitor
Service Desk
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
imcce_openfa
openfa
Commits
4073fab2
Commit
4073fab2
authored
3 years ago
by
Gastineau Mickael
Browse files
Options
Downloads
Patches
Plain Diff
fix the installation step
parent
75070434
Branches
Branches containing commit
Tags
20210512.0.1
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
toolchain/devconfig.cmake
+2
-2
2 additions, 2 deletions
toolchain/devconfig.cmake
toolchain/openfaConfig.cmake.in
+4
-4
4 additions, 4 deletions
toolchain/openfaConfig.cmake.in
with
7 additions
and
7 deletions
CMakeLists.txt
+
1
−
1
View file @
4073fab2
#####################################################################
# complete build chain for cmake.
#
# Copyright, 2018-202
1
, IMCCE, CNRS, Observatoire de Paris, PSL.
# Copyright, 2018-202
2
, IMCCE, CNRS, Observatoire de Paris, PSL.
#
#####################################################################
...
...
This diff is collapsed.
Click to expand it.
toolchain/devconfig.cmake
+
2
−
2
View file @
4073fab2
#####################################################################
# create and install the openfaConfig.cmake and openfaConfigVersion.cmake
#
# Copyright, 2021 IMCCE, CNRS, Observatoire de Paris, PSL.
# Copyright, 2021
-2022,
IMCCE, CNRS, Observatoire de Paris, PSL.
#
#####################################################################
# see https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/How-to-create-a-ProjectConfig.cmake-file
...
...
@@ -27,7 +27,7 @@ endif()
include
(
CMakePackageConfigHelpers
)
configure_package_config_file
(
toolchain/openfaConfig.cmake.in
${
PROJECT_BINARY_DIR
}
/openfaConfig.cmake
INSTALL_DESTINATION
"
${
INSTALL_CMAKE_DIR
}
"
PATH_VARS INSTALL_INCLUDE_DIR INSTALL_SYSCONFIG_DIR
)
write_basic_package_version_file
(
${
PROJECT_BINARY_DIR
}
/openfaConfigVersion.cmake VERSION
@
PROJECT_VERSION_MAJOR
@.@
PROJECT_VERSION_MINOR
@.@
PROJECT_VERSION_PATCH
@
COMPATIBILITY SameMajorVersion
)
write_basic_package_version_file
(
${
PROJECT_BINARY_DIR
}
/openfaConfigVersion.cmake VERSION
${
PROJECT_VERSION_MAJOR
}
.
${
PROJECT_VERSION_MINOR
}
.
${
PROJECT_VERSION_PATCH
}
COMPATIBILITY SameMajorVersion
)
# Install the openfaConfig.cmake and openfaConfigVersion.cmake
if
(
OPENFA_INSTALL
)
...
...
This diff is collapsed.
Click to expand it.
toolchain/openfaConfig.cmake.in
+
4
−
4
View file @
4073fab2
#####################################################################
# File to create the package for the installation (....cmake).
#
# Copyright, 2018-202
1
, IMCCE, CNRS, Observatoire de Paris, PSL.
# Copyright, 2018-202
2
, IMCCE, CNRS, Observatoire de Paris, PSL.
#
#####################################################################
# It defines the following variables
...
...
@@ -12,12 +12,12 @@ set(OPENFA_VERSION @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERS
@PACKAGE_INIT@
set
_and_check
(OPENFA_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
set
_and_check
(OPENFA_SYSCONFIG_DIR "@PACKAGE_SYSCONFIG_INSTALL_DIR@")
set(OPENFA_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
set(OPENFA_SYSCONFIG_DIR "@PACKAGE_SYSCONFIG_INSTALL_DIR@")
# library dependency
if(NOT TARGET openfa AND NOT openfa_BINARY_DIR)
include("${
OPENFA_CMAKE
_DIR}/openfaTargets.cmake")
include("${
CMAKE_CURRENT_LIST
_DIR}/openfaTargets.cmake")
endif()
# IMPORTED targets created by openfaTargets.cmake
...
...
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