From ff5c89de0c23c0568afcbabd63974388ca045aa3 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 20 Aug 2016 12:06:55 +0200 Subject: [PATCH 1/2] Help: Widen find_package search path table Make room for additional longer entries. --- Help/command/find_package.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 58dff9d39..8098a87ea 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -194,13 +194,13 @@ configuration file. The tables below show the directories searched. Each entry is meant for installation trees following Windows (W), UNIX (U), or Apple (A) conventions:: - / (W) - /(cmake|CMake)/ (W) - /*/ (W) - /*/(cmake|CMake)/ (W) - /(lib/|lib|share)/cmake/*/ (U) - /(lib/|lib|share)/*/ (U) - /(lib/|lib|share)/*/(cmake|CMake)/ (U) + / (W) + /(cmake|CMake)/ (W) + /*/ (W) + /*/(cmake|CMake)/ (W) + /(lib/|lib|share)/cmake/*/ (U) + /(lib/|lib|share)/*/ (U) + /(lib/|lib|share)/*/(cmake|CMake)/ (U) On systems supporting OS X Frameworks and Application Bundles the following directories are searched for frameworks or bundles From 828d6c137d703ea095008fc6da794904a15c4ebd Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 20 Aug 2016 12:06:55 +0200 Subject: [PATCH 2/2] find_package: Extend search path for combined Windows/UNIX convention Find packages that install their cmake package configuration files in `lib/cmake/` when they are installed in the default Windows CMAKE_INSTALL_PREFIX, `C:/Program Files/`. Closes: #16212 --- Help/command/find_package.rst | 3 ++ Source/cmFindPackageCommand.cxx | 38 +++++++++++++++++++ .../Baz 1.3/lib/cmake/Baz/BazConfig.cmake | 1 + .../lib/cmake/Baz/BazConfigVersion.cmake | 7 ++++ .../Baz 2.0/share/Baz 2/BazConfig.cmake | 1 + .../share/Baz 2/BazConfigVersion.cmake | 7 ++++ .../Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake | 1 + .../lib/Baz 2/cmake/BazConfigVersion.cmake | 7 ++++ Tests/FindPackageTest/CMakeLists.txt | 12 +++++- 9 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake create mode 100644 Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake create mode 100644 Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake create mode 100644 Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake create mode 100644 Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake create mode 100644 Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake diff --git a/Help/command/find_package.rst b/Help/command/find_package.rst index 8098a87ea..c44fe865a 100644 --- a/Help/command/find_package.rst +++ b/Help/command/find_package.rst @@ -201,6 +201,9 @@ Each entry is meant for installation trees following Windows (W), UNIX /(lib/|lib|share)/cmake/*/ (U) /(lib/|lib|share)/*/ (U) /(lib/|lib|share)/*/(cmake|CMake)/ (U) + /*/(lib/|lib|share)/cmake/*/ (W/U) + /*/(lib/|lib|share)/*/ (W/U) + /*/(lib/|lib|share)/*/(cmake|CMake)/ (W/U) On systems supporting OS X Frameworks and Application Bundles the following directories are searched for frameworks or bundles diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 260079b55..8338c2a76 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -1961,6 +1961,44 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in) } } + // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/cmake/(Foo|foo|FOO).*/ + { + cmFindPackageFileList lister(this); + lister / cmFileListGeneratorFixed(prefix) / + cmFileListGeneratorProject(this->Names) / + cmFileListGeneratorEnumerate(common) / + cmFileListGeneratorFixed("cmake") / + cmFileListGeneratorProject(this->Names); + if (lister.Search()) { + return true; + } + } + + // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/ + { + cmFindPackageFileList lister(this); + lister / cmFileListGeneratorFixed(prefix) / + cmFileListGeneratorProject(this->Names) / + cmFileListGeneratorEnumerate(common) / + cmFileListGeneratorProject(this->Names); + if (lister.Search()) { + return true; + } + } + + // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib|share)/(Foo|foo|FOO).*/(cmake|CMake)/ + { + cmFindPackageFileList lister(this); + lister / cmFileListGeneratorFixed(prefix) / + cmFileListGeneratorProject(this->Names) / + cmFileListGeneratorEnumerate(common) / + cmFileListGeneratorProject(this->Names) / + cmFileListGeneratorCaseInsensitive("cmake"); + if (lister.Search()) { + return true; + } + } + return false; } diff --git a/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake new file mode 100644 index 000000000..deffa5729 --- /dev/null +++ b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfig.cmake @@ -0,0 +1 @@ +# Test config file. diff --git a/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake new file mode 100644 index 000000000..d8cac77ed --- /dev/null +++ b/Tests/FindPackageTest/Baz 1.3/lib/cmake/Baz/BazConfigVersion.cmake @@ -0,0 +1,7 @@ +set(PACKAGE_VERSION 1.3) +if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1) + set(PACKAGE_VERSION_COMPATIBLE 1) + if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 3) + set(PACKAGE_VERSION_EXACT 1) + endif() +endif() diff --git a/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake b/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake new file mode 100644 index 000000000..deffa5729 --- /dev/null +++ b/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfig.cmake @@ -0,0 +1 @@ +# Test config file. diff --git a/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake b/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake new file mode 100644 index 000000000..5026fada0 --- /dev/null +++ b/Tests/FindPackageTest/Baz 2.0/share/Baz 2/BazConfigVersion.cmake @@ -0,0 +1,7 @@ +set(PACKAGE_VERSION 2.0) +if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 2) + set(PACKAGE_VERSION_COMPATIBLE 1) + if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) + set(PACKAGE_VERSION_EXACT 1) + endif() +endif() diff --git a/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake b/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake new file mode 100644 index 000000000..deffa5729 --- /dev/null +++ b/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake @@ -0,0 +1 @@ +# Test config file. diff --git a/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake b/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake new file mode 100644 index 000000000..a18014388 --- /dev/null +++ b/Tests/FindPackageTest/Baz 2.1/lib/Baz 2/cmake/BazConfigVersion.cmake @@ -0,0 +1,7 @@ +set(PACKAGE_VERSION 2.1) +if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 2) + set(PACKAGE_VERSION_COMPATIBLE 1) + if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) + set(PACKAGE_VERSION_EXACT 1) + endif() +endif() diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt index d3e68bc5f..04bbbc60a 100644 --- a/Tests/FindPackageTest/CMakeLists.txt +++ b/Tests/FindPackageTest/CMakeLists.txt @@ -102,6 +102,7 @@ endif() set(PACKAGES foo Foo Bar Blub TFramework Tframework TApp Tapp Special VersionedA VersionedB VersionedC VersionedD VersionedE + VersionedF VersionedG VersionedH WrongA WrongB WrongC WrongD wibbleA wibbleB RecursiveA RecursiveB RecursiveC @@ -142,6 +143,10 @@ find_package(VersionedB 3.1 EXACT NAMES zot) find_package(VersionedC 4.0 EXACT NAMES zot) find_package(VersionedD 1.1 EXACT NAMES Baz) find_package(VersionedE 1.2 EXACT NAMES Baz) +find_package(VersionedF 1.3 EXACT NAMES Baz) +find_package(VersionedG 2.0 EXACT NAMES Baz) +find_package(VersionedH 2.1 EXACT NAMES Baz) + # Test Config files which set Xyz_FOUND themselves: find_package(SetFoundTRUE NO_MODULE) @@ -158,12 +163,12 @@ find_package(WrongB 1.2 EXACT NAMES Baz) # Test wrong initial path when result is missing. set(WrongC_DIR "${VersionedD_DIR}") -find_package(WrongC 1.3 EXACT QUIET NAMES Baz) +find_package(WrongC 1.4 EXACT QUIET NAMES Baz) # Test wrong initial cache entry of UNINITIALIZED type when result is missing. set(WrongD_DIR "${VersionedD_DIR}" CACHE UNINITIALIZED "Wrong Value" FORCE) get_property(type CACHE WrongD_DIR PROPERTY TYPE) -find_package(WrongD 1.3 EXACT QUIET NAMES Baz) +find_package(WrongD 1.4 EXACT QUIET NAMES Baz) # HINTS should override the system but PATHS should not list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/A") @@ -216,6 +221,9 @@ set(VersionedB_EXPECTED "lib/zot-3.1/zot-config.cmake") set(VersionedC_EXPECTED "lib/cmake/zot-4.0/zot-config.cmake") set(VersionedD_EXPECTED "Baz 1.1/BazConfig.cmake") set(VersionedE_EXPECTED "Baz 1.2/CMake/BazConfig.cmake") +set(VersionedF_EXPECTED "Baz 1.3/lib/cmake/Baz/BazConfig.cmake") +set(VersionedG_EXPECTED "Baz 2.0/share/Baz 2/BazConfig.cmake") +set(VersionedH_EXPECTED "Baz 2.1/lib/Baz 2/cmake/BazConfig.cmake") set(WrongA_EXPECTED "${VersionedE_EXPECTED}") set(WrongB_EXPECTED "${VersionedE_EXPECTED}") set(WrongC_MISSING "WrongC_DIR-NOTFOUND")