Skip to content
Snippets Groups Projects
Unverified Commit 6be054e6 authored by Tim Kaune's avatar Tim Kaune
Browse files

Replace custom HandlePolicies script with native CMake feature

Bump minimum required CMake version to 3.30 for package init fixes
Remove now obsolete script file
parent b5554004
No related branches found
No related tags found
No related merge requests found
...@@ -23,13 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ...@@ -23,13 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
]] ]]
cmake_minimum_required(VERSION 3.25)
set(CMAKE_MAXIMUM_SUPPORTED_VERSION 3.31) set(CMAKE_MAXIMUM_SUPPORTED_VERSION 3.31)
include("./cmake/HandlePolicies.cmake" NO_POLICY_SCOPE) cmake_minimum_required(VERSION 3.30...${CMAKE_MAXIMUM_SUPPORTED_VERSION})
project(LoadStaticSharedTargets VERSION 1.7.0 LANGUAGES NONE) project(LoadStaticSharedTargets VERSION 1.8.0 LANGUAGES NONE)
include(GNUInstallDirs) include(GNUInstallDirs)
......
...@@ -131,9 +131,9 @@ include(FetchContent) ...@@ -131,9 +131,9 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
LoadStaticSharedTargets LoadStaticSharedTargets
GIT_REPOSITORY "https://github.com/lepus2589/LoadStaticSharedTargets.git" GIT_REPOSITORY "https://github.com/lepus2589/LoadStaticSharedTargets.git"
GIT_TAG v1.7.0 GIT_TAG v1.8.0
SYSTEM SYSTEM
FIND_PACKAGE_ARGS 1.7.0 CONFIG NAMES LoadStaticSharedTargets FIND_PACKAGE_ARGS 1.8.0 CONFIG NAMES LoadStaticSharedTargets
) )
set(LoadStaticSharedTargets_INCLUDE_PACKAGING TRUE) set(LoadStaticSharedTargets_INCLUDE_PACKAGING TRUE)
FetchContent_MakeAvailable(LoadStaticSharedTargets) FetchContent_MakeAvailable(LoadStaticSharedTargets)
......
#[[
MIT License
CMake build script for LoadStaticSharedTargets module
Copyright (c) 2025 Tim Kaune
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
]]
if (NOT DEFINED CMAKE_MAXIMUM_SUPPORTED_VERSION)
set(CMAKE_MAXIMUM_SUPPORTED_VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION})
endif ()
# If CMAKE_VERSION <= CMAKE_MAXIMUM_SUPPORTED_VERSION is used, set policies up
# to CMAKE_VERSION to NEW
if (${CMAKE_VERSION} VERSION_LESS_EQUAL ${CMAKE_MAXIMUM_SUPPORTED_VERSION})
cmake_policy(VERSION ${CMAKE_VERSION})
# If CMAKE_VERSION > CMAKE_MAXIMUM_SUPPORTED_VERSION is used, set policies up to
# CMAKE_MAXIMUM_SUPPORTED_VERSION to NEW
else ()
cmake_policy(VERSION ${CMAKE_MAXIMUM_SUPPORTED_VERSION})
endif()
...@@ -47,8 +47,6 @@ write_basic_package_version_file( ...@@ -47,8 +47,6 @@ write_basic_package_version_file(
COMPATIBILITY SameMajorVersion COMPATIBILITY SameMajorVersion
) )
file(READ "../cmake/HandlePolicies.cmake" HANDLE_POLICIES_SCRIPT OFFSET 1128)
configure_package_config_file( configure_package_config_file(
"LoadStaticSharedTargetsConfig.cmake.in" "LoadStaticSharedTargetsConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/LoadStaticSharedTargetsConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/LoadStaticSharedTargetsConfig.cmake"
......
...@@ -25,13 +25,7 @@ SOFTWARE. ...@@ -25,13 +25,7 @@ SOFTWARE.
@PACKAGE_INIT@ @PACKAGE_INIT@
cmake_minimum_required(VERSION @CMAKE_MINIMUM_REQUIRED_VERSION@) cmake_minimum_required(VERSION @CMAKE_MINIMUM_REQUIRED_VERSION@...@CMAKE_MAXIMUM_SUPPORTED_VERSION@)
set(CMAKE_MAXIMUM_SUPPORTED_VERSION @CMAKE_MAXIMUM_SUPPORTED_VERSION@)
# begin HANDLE_POLICIES_SCRIPT
@HANDLE_POLICIES_SCRIPT@
# end HANDLE_POLICIES_SCRIPT
# include(LoadStaticSharedTargets) should work after this # include(LoadStaticSharedTargets) should work after this
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
......
...@@ -23,17 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ...@@ -23,17 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
]] ]]
cmake_policy(VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION}) cmake_policy(VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION}...${CMAKE_MAXIMUM_SUPPORTED_VERSION})
# If CMAKE_VERSION <= CMAKE_MAXIMUM_SUPPORTED_VERSION is used, set policies up
# to CMAKE_VERSION to NEW
if (${CMAKE_VERSION} VERSION_LESS_EQUAL ${CMAKE_MAXIMUM_SUPPORTED_VERSION})
cmake_policy(VERSION ${CMAKE_VERSION})
# If CMAKE_VERSION > CMAKE_MAXIMUM_SUPPORTED_VERSION is used, set policies up to
# CMAKE_MAXIMUM_SUPPORTED_VERSION to NEW
else ()
cmake_policy(VERSION ${CMAKE_MAXIMUM_SUPPORTED_VERSION})
endif()
include("./helpers/assertions.cmake") include("./helpers/assertions.cmake")
include("../src/cmake/LoadStaticSharedTargets.cmake") include("../src/cmake/LoadStaticSharedTargets.cmake")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment