[Scummvm-git-logs] scummvm master -> ac094c68681e0f8791694b3e1bb8a745d6e34955
bluegr
noreply at scummvm.org
Sun Jan 15 10:02:52 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ac094c6868 CREATE_PROJECT: only specify those cmake parameters for find_feature, that are really used
Commit: ac094c68681e0f8791694b3e1bb8a745d6e34955
https://github.com/scummvm/scummvm/commit/ac094c68681e0f8791694b3e1bb8a745d6e34955
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2023-01-15T12:02:47+02:00
Commit Message:
CREATE_PROJECT: only specify those cmake parameters for find_feature, that are really used
Changed paths:
devtools/create_project/cmake.cpp
diff --git a/devtools/create_project/cmake.cpp b/devtools/create_project/cmake.cpp
index 6f62e04f50b..ef84b674eb0 100644
--- a/devtools/create_project/cmake.cpp
+++ b/devtools/create_project/cmake.cpp
@@ -192,35 +192,25 @@ void CMakeProvider::writeFeatureLibSearch(const BuildSetup &setup, std::ofstream
if (library) {
workspace << "find_feature(";
workspace << "name " << library->feature;
- workspace << " pkgconfig_name ";
if (library->pkgConfig) {
+ workspace << " pkgconfig_name ";
workspace << library->pkgConfig;
- } else {
- workspace << "IGNORE";
}
- workspace << " findpackage_name ";
if (library->package) {
+ workspace << " findpackage_name ";
workspace << library->package;
- } else {
- workspace << "IGNORE";
}
- workspace << " include_dirs_var ";
if (library->includesVar) {
+ workspace << " include_dirs_var ";
workspace << library->includesVar;
- } else {
- workspace << "IGNORE";
}
- workspace << " libraries_var ";
if (library->librariesVar) {
+ workspace << " libraries_var ";
workspace << library->librariesVar;
- } else {
- workspace << "IGNORE";
}
- workspace << " libraries ";
if (library->libraries) {
+ workspace << " libraries ";
workspace << library->libraries;
- } else {
- workspace << "IGNORE";
}
workspace << ")\n";
}
More information about the Scummvm-git-logs
mailing list