From dee7ef23e4eb63209362c5d0ec2c3b683e28a966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Fri, 13 Sep 2024 17:05:47 +0200 Subject: [PATCH 1/5] [cmake] Set CMP0167 to use config file to find Boost Changed behavior in CMake 3.30. New behvior is compatible with Boost 1.70 and newer. --- CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6abdf4057..a8c98843d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,11 @@ SET( CMAKE_MODULE_PATH INCLUDE(ZyppCommon) INCLUDE(CMakePushCheckState) +# use Boost's config file +if(POLICY CMP0167) + cmake_policy(SET CMP0167 NEW) +endif() + # allow name libraries by name mixed with full # paths if(COMMAND cmake_policy) From e73048feff42c63cc00edfa92d963fd9efc4868c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Fri, 13 Sep 2024 17:06:18 +0200 Subject: [PATCH 2/5] [cmake] Remove second inclusion of CPack CPack is already included in ZyppCommon.cmake --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8c98843d..4f431fc92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,7 +156,6 @@ SET( LIBZYPP_SOVERSION_INFO "${LIBZYPP_SO_FIRST}" ) GENERATE_PACKAGING(${PACKAGE} ${VERSION}) -INCLUDE(CPack) #################################################################### FIND_PACKAGE(Boost REQUIRED COMPONENTS program_options unit_test_framework thread) IF (Boost_FOUND) From 4d6ee5e3e428eee954824f7bf0397bbe31208e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Fri, 13 Sep 2024 17:07:20 +0200 Subject: [PATCH 3/5] [cmake] Remove commented code Code unused for 17 years. --- cmake/modules/ZyppCommon.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmake/modules/ZyppCommon.cmake b/cmake/modules/ZyppCommon.cmake index a697107d7..f06f1b6d2 100644 --- a/cmake/modules/ZyppCommon.cmake +++ b/cmake/modules/ZyppCommon.cmake @@ -110,13 +110,7 @@ MACRO(GENERATE_PACKAGING PACKAGE VERSION) "Makefile\\\\.in$" ) - #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.") SET(CPACK_PACKAGE_VENDOR "Novell Inc.") - #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt") - #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") - #SET(CPACK_PACKAGE_VERSION_MAJOR ${version_major}) - #SET(CPACK_PACKAGE_VERSION_MINOR ${version_minor}) - #SET(CPACK_PACKAGE_VERSION_PATCH ${version_patch}) SET( CPACK_GENERATOR "TBZ2") SET( CPACK_SOURCE_GENERATOR "TBZ2") SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) From 7911f9dfa82d0092ae987808c5c53b23ee062de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Fri, 13 Sep 2024 17:07:53 +0200 Subject: [PATCH 4/5] [cmake] Change vendor from Novell to SUSE when using CPack --- cmake/modules/ZyppCommon.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/ZyppCommon.cmake b/cmake/modules/ZyppCommon.cmake index f06f1b6d2..c78319848 100644 --- a/cmake/modules/ZyppCommon.cmake +++ b/cmake/modules/ZyppCommon.cmake @@ -110,7 +110,7 @@ MACRO(GENERATE_PACKAGING PACKAGE VERSION) "Makefile\\\\.in$" ) - SET(CPACK_PACKAGE_VENDOR "Novell Inc.") + SET(CPACK_PACKAGE_VENDOR "SUSE LLE") SET( CPACK_GENERATOR "TBZ2") SET( CPACK_SOURCE_GENERATOR "TBZ2") SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) From e922452f6d2cda845d43a9455e86a0f181a6824f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= Date: Fri, 13 Sep 2024 19:45:35 +0200 Subject: [PATCH 5/5] [cmake] Include FindPkgConfig conditionally to get rid of warning Prior to this change FindPackageHandleStandardArgs wrongly warned that find_package_handle_standard_args is called with non-matching spelling of the library name. --- cmake/modules/Findlibproxy.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/modules/Findlibproxy.cmake b/cmake/modules/Findlibproxy.cmake index b6d945446..1fcb88498 100644 --- a/cmake/modules/Findlibproxy.cmake +++ b/cmake/modules/Findlibproxy.cmake @@ -2,6 +2,8 @@ # alternatives like the PacRunner replacement which *just* queries PacRunner # directly will only provide a .pc file. So use pkg-config to find it... -INCLUDE ( FindPkgConfig ) +if(NOT PKG_CONFIG_FOUND) + include(FindPkgConfig) +endif() PKG_CHECK_MODULES( LIBPROXY libproxy-1.0 )