Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Netlib f2c
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
netlib
Netlib f2c
Commits
acb29566
Verified
Commit
acb29566
authored
Mar 6, 2024
by
Tim Kaune
Browse files
Options
Downloads
Patches
Plain Diff
Fix path composition in packaging
parent
c8b7b51d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-3
3 additions, 3 deletions
CMakeLists.txt
packaging/CMakeLists.txt
+2
-6
2 additions, 6 deletions
packaging/CMakeLists.txt
with
5 additions
and
9 deletions
CMakeLists.txt
+
3
−
3
View file @
acb29566
...
...
@@ -52,6 +52,8 @@ if (BUILD_SHARED_LIBS)
check_pie_supported
()
endif
()
option
(
NetlibF2C_INCLUDE_PACKAGING
"Include packaging rules for Netlib F2C"
"
${
IS_TOP_LEVEL
}
"
)
FetchContent_Declare
(
LoadStaticSharedTargets
GIT_REPOSITORY
"git@gitlab.aei.uni-hannover.de:cmake/loadstaticsharedtargets.git"
...
...
@@ -60,14 +62,12 @@ FetchContent_Declare(
FIND_PACKAGE_ARGS 1.5.0 CONFIG NAMES LoadStaticSharedTargets
)
set
(
LoadStaticSharedTargets_INCLUDE_PACKAGING
TRUE
)
set
(
LoadStaticSharedTargets_INCLUDE_PACKAGING
"
${
NetlibF2C_INCLUDE_PACKAGING
}
"
)
FetchContent_MakeAvailable
(
LoadStaticSharedTargets
)
add_subdirectory
(
src
)
option
(
NetlibF2C_INCLUDE_PACKAGING
"Include packaging rules for Netlib F2C"
"
${
IS_TOP_LEVEL
}
"
)
if
(
NetlibF2C_INCLUDE_PACKAGING
)
add_subdirectory
(
packaging
)
endif
()
This diff is collapsed.
Click to expand it.
packaging/CMakeLists.txt
+
2
−
6
View file @
acb29566
...
...
@@ -96,8 +96,8 @@ write_basic_package_version_file(
file
(
READ
"../cmake/HandlePolicies.cmake"
HANDLE_POLICIES_SCRIPT OFFSET 1108
)
if
(
NOT
LoadStaticSharedTargets_
F
OU
ND
)
set
(
LoadStaticSharedTargets_DIR
"
${
LoadStaticSharedTargets_
INSTALL_CMAKE
DIR
}
"
)
if
(
DEFINED
LoadStaticSharedTargets_
S
OU
RCE_DIR
)
cmake_path
(
APPEND CMAKE_INSTALL_PREFIX
"
${
LoadStaticSharedTargets_INSTALL_CMAKEDIR
}
"
OUTPUT_VARIABLE
LoadStaticSharedTargets_DIR
)
endif
()
configure_file
(
...
...
@@ -106,10 +106,6 @@ configure_file(
@ONLY
)
if
(
NOT LoadStaticSharedTargets_FOUND
)
unset
(
LoadStaticSharedTargets_DIR
)
endif
()
install
(
FILES
"
${
CMAKE_CURRENT_BINARY_DIR
}
/NetlibF2CConfigVersion.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