feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMakePM: Search for Config modules also in CMAKE_MODULE_PATH

Browse Source 
This is allowed by `find_package`, and can be tested with the `fmt`
package provided by conan.

Change-Id: Ib9bf2a6cbd80b8eb322cb6d8a1a9c25af0ca4031
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Cristian Adam
2023-10-17 16:10:03 +02:00
parent b5d0c5dd36
commit cdc7857572
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cmakeprojectmanager/cmakefilecompletionassist.cpp
View File

@@ -400,7 +400,8 @@ static QPair<QStringList, QStringList> getFindAndConfigCMakePackages(
std::function<QString(const QString &)> function; std::function<QString(const QString &)> function;
QStringList &result; QStringList &result;
} mapping[] = {{"CMAKE_PREFIX_PATH", "lib/cmake", configPackageName, configPackages}, } mapping[] = {{"CMAKE_PREFIX_PATH", "lib/cmake", configPackageName, configPackages},
{"CMAKE_MODULE_PATH", QString(), findPackageName, modulePackages}}; {"CMAKE_MODULE_PATH", QString(), findPackageName, modulePackages},
{"CMAKE_MODULE_PATH", QString(), configPackageName, configPackages}};
for (const auto &m : mapping) { for (const auto &m : mapping) {
FilePaths paths = Utils::transform<FilePaths>(cmakeCache.valueOf(m.cmakeVariable).split(';'), FilePaths paths = Utils::transform<FilePaths>(cmakeCache.valueOf(m.cmakeVariable).split(';'),