Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 689410 | Differences between
and this patch

Collapse All | Expand All

(-)cmake-3.15.3/Source/cmFindPackageCommand.h.orig (+1 lines)
Lines 190-195 Link Here
190
  bool UseLibx32Paths;
190
  bool UseLibx32Paths;
191
  bool UseRealPath;
191
  bool UseRealPath;
192
  bool PolicyScope;
192
  bool PolicyScope;
193
  std::string CustomLibSuffix;
193
  std::string LibraryArchitecture;
194
  std::string LibraryArchitecture;
194
  std::vector<std::string> Names;
195
  std::vector<std::string> Names;
195
  std::vector<std::string> Configs;
196
  std::vector<std::string> Configs;
(-)cmake-3.15.3/Source/cmFindPackageCommand.cxx.orig (+10 lines)
Lines 160-165 Link Here
160
  // Check for debug mode.
160
  // Check for debug mode.
161
  this->DebugMode = this->Makefile->IsOn("CMAKE_FIND_DEBUG_MODE");
161
  this->DebugMode = this->Makefile->IsOn("CMAKE_FIND_DEBUG_MODE");
162
162
163
  // add custom lib<qual> paths instead of using fixed lib32, lib64 or
164
  // libx32
165
  if (const char* customLib = this->Makefile->GetDefinition(
166
        "CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX")) {
167
    this->CustomLibSuffix = customLib;
168
  }
169
163
  // Lookup target architecture, if any.
170
  // Lookup target architecture, if any.
164
  if (const char* arch =
171
  if (const char* arch =
165
        this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE")) {
172
        this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE")) {
Lines 2116-2121 Link Here
2116
2123
2117
  // Construct list of common install locations (lib and share).
2124
  // Construct list of common install locations (lib and share).
2118
  std::vector<std::string> common;
2125
  std::vector<std::string> common;
2126
  if (!this->CustomLibSuffix.empty()) {
2127
    common.push_back("lib" + this->CustomLibSuffix);
2128
  }
2119
  if (!this->LibraryArchitecture.empty()) {
2129
  if (!this->LibraryArchitecture.empty()) {
2120
    common.push_back("lib/" + this->LibraryArchitecture);
2130
    common.push_back("lib/" + this->LibraryArchitecture);
2121
  }
2131
  }

Return to bug 689410