aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corect handling dynamic libraries on Windows with MSVC.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-03-25 13:59:58 +02:00
parent 7383d78775
commit 5597a497b5
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
qbs/module-providers/conan/provider.qbs
View File

@ -27,6 +27,7 @@ ModuleProvider {
file.close(); file.close();
var settings = fileContent.settings;
var deps = fileContent.dependencies; var deps = fileContent.dependencies;
for(i in deps){ for(i in deps){
@ -69,8 +70,32 @@ ModuleProvider {
} }
var cppLibraries = shared ? "\tcpp.dynamicLibraries: " : "\tcpp.staticLibraries: "; var cppLibraries = shared ? "\tcpp.dynamicLibraries: " : "\tcpp.staticLibraries: ";
var cppLibrariesTag = shared ? "dynamiclibrary" : "staticlibrary";
var cppLibrarySuffix = shared ? "cpp.dynamicLibrarySuffix" : "cpp.staticLibrarySuffix"; var cppLibrariesTag = "staticlibrary";
if (shared)
{
if (settings["os"] == "Linux" || settings["os"] == "Macos")
{
cppLibrariesTag = "dynamiclibrary";
}
else
{
cppLibrariesTag = "dynamiclibrary_import";
}
}
var cppLibrarySuffix = "cpp.staticLibrarySuffix";
if (shared)
{
if (settings["os"] == "Linux" || settings["os"] == "Macos")
{
cppLibrarySuffix = "cpp.dynamicLibrarySuffix";
}
else
{
cppLibrarySuffix = "cpp.staticLibrarySuffix";
}
}
moduleFile.write("import qbs\n" + moduleFile.write("import qbs\n" +
"Module {\n" + "Module {\n" +