GerbilSoft/rvthtool
1
Fork 0
mirror of https://github.com/GerbilSoft/rvthtool.git synced 2025-06-18 11:35:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

[cmake] CheckNettle2or3.cmake: Also export NETTLE_FOUND in the PARENT_SCOPE.

Browse Source 
NETTLE_FOUND may be used to determine if libnettle should be
linked to other libraries and/or executables.

This fixes a regression from commit 03ce73c612.
([cmake] CheckNettle2or3.cmake: Convert the macro to a function.)
This commit is contained in:
David Korth 2024-05-17 22:42:35 -04:00
parent f86d5c4ad4
commit 2029a71346
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
appveyor-dpkg.sh
View File

@ -13,4 +13,5 @@ apt-get -y install \
\ \
qtbase5-dev \ qtbase5-dev \
qttools5-dev \ qttools5-dev \
qttools5-dev-tools qttools5-dev-tools \
libkf5widgetsaddons-dev

1
cmake/libs/CheckNettle2or3.cmake
View File

@ -6,6 +6,7 @@ FUNCTION(CHECK_NETTLE_2_OR_3)
FIND_PACKAGE(NETTLE) FIND_PACKAGE(NETTLE)
SET(HAVE_NETTLE ${NETTLE_FOUND}) SET(HAVE_NETTLE ${NETTLE_FOUND})
SET(HAVE_NETTLE ${NETTLE_FOUND} PARENT_SCOPE) SET(HAVE_NETTLE ${NETTLE_FOUND} PARENT_SCOPE)
SET(NETTLE_FOUND ${NETTLE_FOUND} PARENT_SCOPE)
IF(HAVE_NETTLE) IF(HAVE_NETTLE)
# Check if this is Nettle 3.x. # Check if this is Nettle 3.x.
# Nettle 3.1 added version.h, which isn't available # Nettle 3.1 added version.h, which isn't available

8
src/qrvthtool/CMakeLists.txt
View File

@ -92,10 +92,10 @@ ELSE()
SET(QRVTHTOOL_TRANSLATIONS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${DIR_INSTALL_TRANSLATIONS}") SET(QRVTHTOOL_TRANSLATIONS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${DIR_INSTALL_TRANSLATIONS}")
ENDIF() ENDIF()
# KDE5: Check for KWidgetsAddons headers for notification sounds. # KF5/KF6: Check for KWidgetsAddons headers for notification sounds.
IF(UNIX AND NOT APPLE) IF(UNIX AND NOT APPLE)
# Reference: http://www.proli.net/2014/06/21/porting-your-project-to-qt5kf5/ # Reference: http://www.proli.net/2014/06/21/porting-your-project-to-qt5kf5/
# Find KDE5 Extra CMake Modules. # Find KF5/KF6 Extra CMake Modules.
FIND_PACKAGE(ECM ${ECM_MINIMUM_VERSION} NO_MODULE) FIND_PACKAGE(ECM ${ECM_MINIMUM_VERSION} NO_MODULE)
IF(ECM_MODULE_PATH AND ECM_KDE_MODULE_DIR) IF(ECM_MODULE_PATH AND ECM_KDE_MODULE_DIR)
# Make sure ECM's CMake files don't create an uninstall rule. # Make sure ECM's CMake files don't create an uninstall rule.
@ -104,7 +104,7 @@ IF(UNIX AND NOT APPLE)
# Don't add KDE tests to the CTest build. # Don't add KDE tests to the CTest build.
SET(KDE_SKIP_TEST_SETTINGS TRUE) SET(KDE_SKIP_TEST_SETTINGS TRUE)
# Include KDE5 CMake modules. # Include KF5/KF6 CMake modules.
LIST(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) LIST(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
# NOTE: The following are not needed for rvthtool and cause # NOTE: The following are not needed for rvthtool and cause
# duplicate moc generation, but we're leaving it here for reference. # duplicate moc generation, but we're leaving it here for reference.
@ -116,7 +116,7 @@ IF(UNIX AND NOT APPLE)
# NOTE: Not needed because KDECompilerSettings isn't used. # NOTE: Not needed because KDECompilerSettings isn't used.
#STRING(REPLACE "-std=iso9899:1990" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") #STRING(REPLACE "-std=iso9899:1990" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
# Find KDE5. (TODO: Version?) # Find KF5/KF6. (TODO: Version?)
FIND_PACKAGE(${KF_NS} ${KF_MIN} COMPONENTS WidgetsAddons) FIND_PACKAGE(${KF_NS} ${KF_MIN} COMPONENTS WidgetsAddons)
IF(${KF_NS}WidgetsAddons_FOUND) IF(${KF_NS}WidgetsAddons_FOUND)
SET(HAVE_KF_WidgetsAddons 1) SET(HAVE_KF_WidgetsAddons 1)