diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index f680aaa20e3..fff3feeab6e 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -11,6 +11,7 @@ Product { property bool useNonGuiPchFile: false property bool useGuiPchFile: false property bool useQt: true + property bool hasCMakeProjectFile: true property string pathToSharedSources: FileInfo.joinPaths(path, FileInfo.relativePath(FileInfo.joinPaths('/', qtc.ide_qbs_imports_path), FileInfo.joinPaths('/', qtc.ide_shared_sources_path))) @@ -90,7 +91,8 @@ Product { Group { name: "CMake project file" + condition: hasCMakeProjectFile prefix: sourceDirectory + '/' - files: "CMakeLists.tx[t]" + files: "CMakeLists.txt" } } diff --git a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs index d6558880f8e..737c67c373e 100644 --- a/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs +++ b/src/libs/3rdparty/yaml-cpp/yaml-cpp.qbs @@ -1,5 +1,6 @@ QtcLibrary { name: "yaml-cpp" + hasCMakeProjectFile: false cpp.defines: base.concat(["YAML_CPP_DLL", "yaml_cpp_EXPORTS"]) cpp.includePaths: [product.sourceDirectory + "/include/"] diff --git a/src/plugins/qmldesignerbase/settings/qmldesignersettings.qbs b/src/plugins/qmldesignerbase/settings/qmldesignersettings.qbs index f276ee77161..c9cd8916fa5 100644 --- a/src/plugins/qmldesignerbase/settings/qmldesignersettings.qbs +++ b/src/plugins/qmldesignerbase/settings/qmldesignersettings.qbs @@ -1,6 +1,7 @@ QtcLibrary { name: "QmlDesignerSettings" type: "staticlibrary" + hasCMakeProjectFile: false Depends { name: "Utils" } diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.qbs b/src/tools/cplusplus-ast2png/cplusplus-ast2png.qbs index 060176e2b30..477e0a7d321 100644 --- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.qbs +++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.qbs @@ -2,5 +2,6 @@ import "../cplusplus-shared/CPlusPlusToolUsingCustomUtils.qbs" as CPlusPlusToolU CPlusPlusToolUsingCustomUtils { name: "cplusplus-ast2png" + hasCMakeProjectFile: false files: base.concat(["cplusplus-ast2png.cpp"]) } diff --git a/src/tools/cplusplus-frontend/cplusplus-frontend.qbs b/src/tools/cplusplus-frontend/cplusplus-frontend.qbs index 56b3d28c194..e074a79266b 100644 --- a/src/tools/cplusplus-frontend/cplusplus-frontend.qbs +++ b/src/tools/cplusplus-frontend/cplusplus-frontend.qbs @@ -2,5 +2,6 @@ import "../cplusplus-shared/CPlusPlusToolUsingCustomUtils.qbs" as CPlusPlusToolU CPlusPlusToolUsingCustomUtils { name: "cplusplus-frontend" + hasCMakeProjectFile: false files: base.concat("cplusplus-frontend.cpp") } diff --git a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.qbs b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.qbs index 064e1967984..3af85353026 100644 --- a/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.qbs +++ b/src/tools/cplusplus-mkvisitor/cplusplus-mkvisitor.qbs @@ -2,6 +2,7 @@ import "../cplusplus-shared/CPlusPlusToolUsingCustomUtils.qbs" as CPlusPlusToolU CPlusPlusToolUsingCustomUtils { name: "cplusplus-mkvisitor" + hasCMakeProjectFile: false cpp.defines: base.concat('PATH_AST_H="' + path + '/../../libs/3rdparty/cplusplus/AST.h"') files: base.concat("cplusplus-mkvisitor.cpp") } diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.qbs b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.qbs index 66dbba53723..09b5e4d1891 100644 --- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.qbs +++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.qbs @@ -2,6 +2,7 @@ import "../cplusplus-shared/CPlusPlusTool.qbs" as CPlusPlusTool CPlusPlusTool { name: "cplusplus-update-frontend" + hasCMakeProjectFile: false cpp.defines: base.concat([ 'PATH_CPP_FRONTEND="' + path + '/../../libs/3rdparty/cplusplus"',