qbs build: Do not use a wildcard for the CMake project file

The use of the wildcard triggers a re-resolve whenever the parent
directory's timestamp changes, which is annoying.

Change-Id: Ic5abc6355568d444cdf6644ee6f1d5d00a7faf49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2025-04-15 14:28:15 +02:00
parent eb0e9a8f89
commit 5a6088e07f
7 changed files with 9 additions and 1 deletions

View File

@@ -11,6 +11,7 @@ Product {
property bool useNonGuiPchFile: false property bool useNonGuiPchFile: false
property bool useGuiPchFile: false property bool useGuiPchFile: false
property bool useQt: true property bool useQt: true
property bool hasCMakeProjectFile: true
property string pathToSharedSources: FileInfo.joinPaths(path, property string pathToSharedSources: FileInfo.joinPaths(path,
FileInfo.relativePath(FileInfo.joinPaths('/', qtc.ide_qbs_imports_path), FileInfo.relativePath(FileInfo.joinPaths('/', qtc.ide_qbs_imports_path),
FileInfo.joinPaths('/', qtc.ide_shared_sources_path))) FileInfo.joinPaths('/', qtc.ide_shared_sources_path)))
@@ -90,7 +91,8 @@ Product {
Group { Group {
name: "CMake project file" name: "CMake project file"
condition: hasCMakeProjectFile
prefix: sourceDirectory + '/' prefix: sourceDirectory + '/'
files: "CMakeLists.tx[t]" files: "CMakeLists.txt"
} }
} }

View File

@@ -1,5 +1,6 @@
QtcLibrary { QtcLibrary {
name: "yaml-cpp" name: "yaml-cpp"
hasCMakeProjectFile: false
cpp.defines: base.concat(["YAML_CPP_DLL", "yaml_cpp_EXPORTS"]) cpp.defines: base.concat(["YAML_CPP_DLL", "yaml_cpp_EXPORTS"])
cpp.includePaths: [product.sourceDirectory + "/include/"] cpp.includePaths: [product.sourceDirectory + "/include/"]

View File

@@ -1,6 +1,7 @@
QtcLibrary { QtcLibrary {
name: "QmlDesignerSettings" name: "QmlDesignerSettings"
type: "staticlibrary" type: "staticlibrary"
hasCMakeProjectFile: false
Depends { name: "Utils" } Depends { name: "Utils" }

View File

@@ -2,5 +2,6 @@ import "../cplusplus-shared/CPlusPlusToolUsingCustomUtils.qbs" as CPlusPlusToolU
CPlusPlusToolUsingCustomUtils { CPlusPlusToolUsingCustomUtils {
name: "cplusplus-ast2png" name: "cplusplus-ast2png"
hasCMakeProjectFile: false
files: base.concat(["cplusplus-ast2png.cpp"]) files: base.concat(["cplusplus-ast2png.cpp"])
} }

View File

@@ -2,5 +2,6 @@ import "../cplusplus-shared/CPlusPlusToolUsingCustomUtils.qbs" as CPlusPlusToolU
CPlusPlusToolUsingCustomUtils { CPlusPlusToolUsingCustomUtils {
name: "cplusplus-frontend" name: "cplusplus-frontend"
hasCMakeProjectFile: false
files: base.concat("cplusplus-frontend.cpp") files: base.concat("cplusplus-frontend.cpp")
} }

View File

@@ -2,6 +2,7 @@ import "../cplusplus-shared/CPlusPlusToolUsingCustomUtils.qbs" as CPlusPlusToolU
CPlusPlusToolUsingCustomUtils { CPlusPlusToolUsingCustomUtils {
name: "cplusplus-mkvisitor" name: "cplusplus-mkvisitor"
hasCMakeProjectFile: false
cpp.defines: base.concat('PATH_AST_H="' + path + '/../../libs/3rdparty/cplusplus/AST.h"') cpp.defines: base.concat('PATH_AST_H="' + path + '/../../libs/3rdparty/cplusplus/AST.h"')
files: base.concat("cplusplus-mkvisitor.cpp") files: base.concat("cplusplus-mkvisitor.cpp")
} }

View File

@@ -2,6 +2,7 @@ import "../cplusplus-shared/CPlusPlusTool.qbs" as CPlusPlusTool
CPlusPlusTool { CPlusPlusTool {
name: "cplusplus-update-frontend" name: "cplusplus-update-frontend"
hasCMakeProjectFile: false
cpp.defines: base.concat([ cpp.defines: base.concat([
'PATH_CPP_FRONTEND="' + path + '/../../libs/3rdparty/cplusplus"', 'PATH_CPP_FRONTEND="' + path + '/../../libs/3rdparty/cplusplus"',