Fix building.

This commit is contained in:
Roman Telezhynskyi 2024-03-22 10:28:35 +02:00
parent ee109cd303
commit d9afd41753
5 changed files with 22 additions and 15 deletions

View File

@ -71,7 +71,7 @@ linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE
- cd ${CIRRUS_WORKING_DIR}/build/coverage-dir - cd ${CIRRUS_WORKING_DIR}/build/coverage-dir
# --preserve-paths helps us avoid name clash for `.gcov` files corresponding to source files # --preserve-paths helps us avoid name clash for `.gcov` files corresponding to source files
# with the same name but in different directories. # with the same name but in different directories.
- find .. -name '*.o' | xargs gcov --preserve-paths - find .. -name '*.o' -exec gcov --preserve-paths {} \;
- cd $CIRRUS_WORKING_DIR - cd $CIRRUS_WORKING_DIR
- sonar-scanner -Dsonar.scm.revision=${CIRRUS_CHANGE_IN_REPO} -Dsonar.links.ci=https://cirrus-ci.com/task/${CIRRUS_TASK_ID} -Dsonar.branch.name=${CIRRUS_BRANCH} -Dsonar.cfamily.gcov.reportsPath="${CIRRUS_WORKING_DIR}/build/coverage-dir" - sonar-scanner -Dsonar.scm.revision=${CIRRUS_CHANGE_IN_REPO} -Dsonar.links.ci=https://cirrus-ci.com/task/${CIRRUS_TASK_ID} -Dsonar.branch.name=${CIRRUS_BRANCH} -Dsonar.cfamily.gcov.reportsPath="${CIRRUS_WORKING_DIR}/build/coverage-dir"
- ccache -s - ccache -s
@ -149,7 +149,7 @@ appimage_task_template: &APPIMAGE_TASK_TEMPLATE
- conan profile new valentina - conan profile new valentina
- conan profile update settings.build_type=Release valentina - conan profile update settings.build_type=Release valentina
- conan profile update settings.os=Linux valentina - conan profile update settings.os=Linux valentina
- conan profile update settings.arch=x86_64 - conan profile update settings.arch=x86_64 valentina
- conan profile update settings.compiler=gcc valentina - conan profile update settings.compiler=gcc valentina
- conan profile update settings.compiler.cppstd=17 valentina - conan profile update settings.compiler.cppstd=17 valentina
- conan profile update settings.compiler.libcxx=libstdc++11 valentina - conan profile update settings.compiler.libcxx=libstdc++11 valentina
@ -361,10 +361,6 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- echo $PATH - echo $PATH
- export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH" - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
- echo $PATH - echo $PATH
- chmod -R 755 /opt/homebrew/opt/qt6/*
- chmod -R 755 /opt/homebrew/opt/openssl@1.1/*
- chmod -R 755 /opt/homebrew/opt/poppler/*
- chmod -R 755 /opt/homebrew/opt/xerces-c/*
- python3 --version - python3 --version
- pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests - pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests
- ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE" - ccache --set-config sloppiness=pch_defines,time_macros max_size="$CCACHE_SIZE"

View File

@ -683,7 +683,10 @@ for:
- conan profile update settings.build_type=Release valentina - conan profile update settings.build_type=Release valentina
- conan profile update settings.os=Macos valentina - conan profile update settings.os=Macos valentina
- conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
- conan profile update settings.compiler=clang valentina - conan profile update settings.os.os_build=Macos valentina
- conan profile update settings.os.arch=x86_64 valentina
- conan profile update settings.os.arch_build=x86_64 valentina
- conan profile update settings.compiler=apple-clang valentina
- conan profile update settings.compiler.cppstd=17 valentina - conan profile update settings.compiler.cppstd=17 valentina
- conan profile update settings.compiler.libcxx=libstdc++11 valentina - conan profile update settings.compiler.libcxx=libstdc++11 valentina
- conan profile update settings.compiler.version=15 valentina - conan profile update settings.compiler.version=15 valentina
@ -878,7 +881,10 @@ for:
- conan profile update settings.build_type=Release valentina - conan profile update settings.build_type=Release valentina
- conan profile update settings.os=Macos valentina - conan profile update settings.os=Macos valentina
- conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina - conan profile update settings.os.Macos.sdk_version=${MACOS_DEPLOYMENT_TARGET} valentina
- conan profile update settings.compiler=clang valentina - conan profile update settings.os_build=Macos valentina
- conan profile update settings.os.arch=x86_64 valentina
- conan profile update settings.os.arch_build=x86_64 valentina
- conan profile update settings.compiler=apple-clang valentina
- conan profile update settings.compiler.cppstd=17 valentina - conan profile update settings.compiler.cppstd=17 valentina
- conan profile update settings.compiler.libcxx=libstdc++11 valentina - conan profile update settings.compiler.libcxx=libstdc++11 valentina
- conan profile update settings.compiler.version=14 valentina - conan profile update settings.compiler.version=14 valentina

View File

@ -24,7 +24,9 @@ class Recipe(ConanFile):
def requirements(self): def requirements(self):
if not self.options.with_xerces: if not self.options.with_xerces:
if "xerces-c" in self.requires:
del self.requires["xerces-c"] del self.requires["xerces-c"]
if not self.options.with_crash_reporting: if not self.options.with_crash_reporting:
if "sentry-crashpad/0.6.5" in self.requires:
del self.requires["sentry-crashpad/0.6.5"] del self.requires["sentry-crashpad/0.6.5"]

View File

@ -20,7 +20,8 @@ SOURCES += \
$$PWD/dialogs/dialogsetupmultisize.cpp \ $$PWD/dialogs/dialogsetupmultisize.cpp \
$$PWD/vtapeshortcutmanager.cpp \ $$PWD/vtapeshortcutmanager.cpp \
$$PWD/tkmmainwindow.cpp \ $$PWD/tkmmainwindow.cpp \
$$PWD/dialogs/dialogknownmeasurementscsvcolumns.cpp $$PWD/dialogs/dialogknownmeasurementscsvcolumns.cpp \
$$PWD/dialogs/dialognoknownmeasurements.cpp
*msvc*:SOURCES += $$PWD/stable.cpp *msvc*:SOURCES += $$PWD/stable.cpp
@ -44,7 +45,8 @@ HEADERS += \
$$PWD/dialogs/dialogsetupmultisize.h \ $$PWD/dialogs/dialogsetupmultisize.h \
$$PWD/vtapeshortcutmanager.h \ $$PWD/vtapeshortcutmanager.h \
$$PWD/tkmmainwindow.h \ $$PWD/tkmmainwindow.h \
$$PWD/dialogs/dialogknownmeasurementscsvcolumns.h $$PWD/dialogs/dialogknownmeasurementscsvcolumns.h \
$$PWD/dialogs/dialognoknownmeasurements.h
FORMS += \ FORMS += \
$$PWD/dialogs/dialogdimensioncustomnames.ui \ $$PWD/dialogs/dialogdimensioncustomnames.ui \
@ -60,5 +62,6 @@ FORMS += \
$$PWD/dialogs/configpages/tapepreferencespathpage.ui \ $$PWD/dialogs/configpages/tapepreferencespathpage.ui \
$$PWD/dialogs/dialogsetupmultisize.ui \ $$PWD/dialogs/dialogsetupmultisize.ui \
$$PWD/tkmmainwindow.ui \ $$PWD/tkmmainwindow.ui \
$$PWD/dialogs/dialogknownmeasurementscsvcolumns.ui $$PWD/dialogs/dialogknownmeasurementscsvcolumns.ui \
$$PWD/dialogs/dialognoknownmeasurements.ui

View File

@ -246,6 +246,6 @@ auto InitializeCrashpad(const QString &appName) -> bool
// Start crash handler // Start crash handler
auto *client = new CrashpadClient(); auto *client = new CrashpadClient();
return client->StartHandler(handler, reportsDir, metricsDir, url.toStdString(), annotations.toStdMap(), arguments, return client->StartHandler(handler, reportsDir, metricsDir, url.toStdString(), "", annotations.toStdMap(),
true, true, attachments); arguments, true, true, attachments);
} }