[patch] Proposed patch to cmake for find_package()

find_package.patch (text/plain), 1.38 KB, created by Marcus Comstedt on 2019-10-06 12:43:28 UTC

--- cmake-3.15.3/Source/cmFindPackageCommand.h.orig	2019-10-06 12:46:10.512838525 +0200
+++ cmake-3.15.3/Source/cmFindPackageCommand.h	2019-10-06 12:47:34.557243268 +0200
@@ -190,6 +190,7 @@
   bool UseLibx32Paths;
   bool UseRealPath;
   bool PolicyScope;
+  std::string CustomLibSuffix;
   std::string LibraryArchitecture;
   std::vector<std::string> Names;
   std::vector<std::string> Configs;
--- cmake-3.15.3/Source/cmFindPackageCommand.cxx.orig	2019-10-06 12:42:04.395652816 +0200
+++ cmake-3.15.3/Source/cmFindPackageCommand.cxx	2019-10-06 12:45:44.420712854 +0200
@@ -160,6 +160,13 @@
   // Check for debug mode.
   this->DebugMode = this->Makefile->IsOn("CMAKE_FIND_DEBUG_MODE");
 
+  // add custom lib<qual> paths instead of using fixed lib32, lib64 or
+  // libx32
+  if (const char* customLib = this->Makefile->GetDefinition(
+        "CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX")) {
+    this->CustomLibSuffix = customLib;
+  }
+
   // Lookup target architecture, if any.
   if (const char* arch =
         this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE")) {
@@ -2116,6 +2123,9 @@
 
   // Construct list of common install locations (lib and share).
   std::vector<std::string> common;
+  if (!this->CustomLibSuffix.empty()) {
+    common.push_back("lib" + this->CustomLibSuffix);
+  }
   if (!this->LibraryArchitecture.empty()) {
     common.push_back("lib/" + this->LibraryArchitecture);
   }