Skip to content
Snippets Groups Projects
Verified Commit acb29566 authored by Tim Kaune's avatar Tim Kaune
Browse files

Fix path composition in packaging

parent c8b7b51d
No related branches found
No related tags found
No related merge requests found
......@@ -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 ()
......@@ -96,8 +96,8 @@ write_basic_package_version_file(
file(READ "../cmake/HandlePolicies.cmake" HANDLE_POLICIES_SCRIPT OFFSET 1108)
if (NOT LoadStaticSharedTargets_FOUND)
set(LoadStaticSharedTargets_DIR "${LoadStaticSharedTargets_INSTALL_CMAKEDIR}")
if (DEFINED LoadStaticSharedTargets_SOURCE_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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment