From dc2d1a6bd436193932d3f4c39cc127a818955d07 Mon Sep 17 00:00:00 2001 From: Florian Reimold <11774314+FlorianReimold@users.noreply.github.com> Date: Tue, 24 Jan 2023 11:22:13 +0100 Subject: [PATCH] CMake: improved fineftpConfig.cmake with find_dependency (#42) - Replaced find_package with find_dependency call that is designed to be used in Package configuration files - Replaced configured install-dir with a lookup in the CURRENT_LIST_DIR --- cmake/fineftpConfig.cmake.in | 6 ++++-- fineftp-server/version.cmake | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/fineftpConfig.cmake.in b/cmake/fineftpConfig.cmake.in index b984ac8..5c1051e 100644 --- a/cmake/fineftpConfig.cmake.in +++ b/cmake/fineftpConfig.cmake.in @@ -1,4 +1,6 @@ @PACKAGE_INIT@ -INCLUDE("@PACKAGE_FINEFTP_INSTALL_CMAKE_DIR@/fineftpTargets.cmake") -find_package(Threads) +include(CMakeFindDependencyMacro) +find_dependency(Threads) + +INCLUDE("${CMAKE_CURRENT_LIST_DIR}/fineftpTargets.cmake") diff --git a/fineftp-server/version.cmake b/fineftp-server/version.cmake index 23adbeb..2b32003 100644 --- a/fineftp-server/version.cmake +++ b/fineftp-server/version.cmake @@ -1,3 +1,3 @@ set(FINEFTP_SERVER_VERSION_MAJOR 1) set(FINEFTP_SERVER_VERSION_MINOR 3) -set(FINEFTP_SERVER_VERSION_PATCH 3) \ No newline at end of file +set(FINEFTP_SERVER_VERSION_PATCH 4)