Merge pull request #707 from saschazelzer/cmake-find-package-poco-fixes

Cmake find package poco fixes
2025-11-28 04:24:15 +01:00 · 2015-02-04 14:10:28 -06:00
parent 9c6b3d66d3 25d3f4ccd4
commit 284aa186a5
18 changed files with 24 additions and 33 deletions
--- a/CppParser/cmake/PocoCppParserConfig.cmake
+++ b/CppParser/cmake/PocoCppParserConfig.cmake
@@ -1,4 +1,3 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoCppParserTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoCppParserTargets.cmake")
--- a/Crypto/cmake/PocoCryptoConfig.cmake
+++ b/Crypto/cmake/PocoCryptoConfig.cmake
@@ -1,4 +1,3 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoCryptoTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoCryptoTargets.cmake")
--- a/Data/MySQL/cmake/PocoDataMySQLConfig.cmake
+++ b/Data/MySQL/cmake/PocoDataMySQLConfig.cmake
@@ -1,5 +1,4 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoData)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoDataMySQLTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoDataMySQLTargets.cmake")
--- a/Data/ODBC/cmake/PocoDataODBCConfig.cmake
+++ b/Data/ODBC/cmake/PocoDataODBCConfig.cmake
@@ -1,5 +1,4 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoData)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoDataODBCTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoDataODBCTargets.cmake")
--- a/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake
+++ b/Data/SQLite/cmake/PocoDataSQLiteConfig.cmake
@@ -1,5 +1,4 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoData)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoDataSQLiteTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoDataSQLiteTargets.cmake")
--- a/Data/cmake/PocoDataConfig.cmake
+++ b/Data/cmake/PocoDataConfig.cmake
@@ -1,4 +1,3 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoDataTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoDataTargets.cmake")
--- a/JSON/cmake/PocoJSONConfig.cmake
+++ b/JSON/cmake/PocoJSONConfig.cmake
@@ -1,4 +1,3 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoJSONTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoJSONTargets.cmake")
--- a/MongoDB/cmake/PocoMongoDBConfig.cmake
+++ b/MongoDB/cmake/PocoMongoDBConfig.cmake
@@ -1,5 +1,4 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoNet)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoMongoDBTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoMongoDBTargets.cmake")
--- a/Net/cmake/PocoNetConfig.cmake
+++ b/Net/cmake/PocoNetConfig.cmake
@@ -1,4 +1,3 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoNetTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoNetTargets.cmake")
--- a/NetSSL_OpenSSL/cmake/PocoNetSSLConfig.cmake
+++ b/NetSSL_OpenSSL/cmake/PocoNetSSLConfig.cmake
@@ -1,7 +1,6 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoUtil)
 find_dependency(PocoNet)
 find_dependency(PocoCrypto)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoNetSSLTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoNetSSLTargets.cmake")
--- a/NetSSL_Win/cmake/PocoNetSSLWinConfig.cmake
+++ b/NetSSL_Win/cmake/PocoNetSSLWinConfig.cmake
@@ -1,6 +1,5 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoUtil)
 find_dependency(PocoNet)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoNetSSLWinTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoNetSSLWinTargets.cmake")
--- a/PDF/cmake/PocoPDFConfig.cmake
+++ b/PDF/cmake/PocoPDFConfig.cmake
@@ -1,4 +1,3 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoPDFTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoPDFTargets.cmake")
--- a/SevenZip/cmake/PocoSevenZipConfig.cmake
+++ b/SevenZip/cmake/PocoSevenZipConfig.cmake
@@ -1,6 +1,5 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoXML)
 find_dependency(PocoUtil)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoSevenZipTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoSevenZipTargets.cmake")
--- a/Util/cmake/PocoUtilConfig.cmake
+++ b/Util/cmake/PocoUtilConfig.cmake
@@ -1,6 +1,5 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoXML)
 find_dependency(PocoJSON)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake")
--- a/XML/cmake/PocoXMLConfig.cmake
+++ b/XML/cmake/PocoXMLConfig.cmake
@@ -1,4 +1,3 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoXMLTargets.cmake")
--- a/Zip/cmake/PocoZipConfig.cmake
+++ b/Zip/cmake/PocoZipConfig.cmake
@@ -1,6 +1,5 @@
 include(CMakeFindDependencyMacro)
-set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
 find_dependency(PocoFoundation)
 find_dependency(PocoUtil)
 find_dependency(PocoXML)
-include("${CMAKE_CURRENT_LIST_DIR}/PocoZipTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/PocoZipTargets.cmake")
--- a/cmake/PocoConfig.cmake.in
+++ b/cmake/PocoConfig.cmake.in
@@ -21,6 +21,10 @@ get_filename_component(_Poco_install_prefix "${CMAKE_CURRENT_LIST_DIR}" ABSOLUTE

 set(_Poco_NOTFOUND_MESSAGE)

+# Let components find each other, but don't overwrite CMAKE_PREFIX_PATH
+set(_Poco_CMAKE_PREFIX_PATH_old ${CMAKE_PREFIX_PATH})
+set(CMAKE_PREFIX_PATH ${_Poco_install_prefix})
+
 foreach(module ${Poco_FIND_COMPONENTS})
    find_package(Poco${module}
        ${_Poco_FIND_PARTS_QUIET}
@@ -39,6 +43,9 @@ foreach(module ${Poco_FIND_COMPONENTS})
    list(APPEND Poco_LIBRARIES "Poco::${module}")
 endforeach()

+# Restore the original CMAKE_PREFIX_PATH value
+set(CMAKE_PREFIX_PATH ${_Poco_CMAKE_PREFIX_PATH_old})
+
 if (_Poco_NOTFOUND_MESSAGE)
    set(Poco_NOT_FOUND_MESSAGE "${_Poco_NOTFOUND_MESSAGE}")
    set(Poco_FOUND False)
--- a/cmake/PocoMacros.cmake
+++ b/cmake/PocoMacros.cmake
@@ -195,7 +195,7 @@ endmacro()
 macro(POCO_GENERATE_PACKAGE target_name)
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
-  "${CMAKE_CURRENT_BINARY_DIR}/Poco${target_name}ConfigVersion.cmake"
+  "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
  VERSION ${PROJECT_VERSION}
  COMPATIBILITY AnyNewerVersion
 )