From c3dc0eb8b069afbaa78bc16d9a59b8016be5a379 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 16 Oct 2024 17:57:05 +0200 Subject: [PATCH] Scripts: remove useless QMake files --- scripts/qmake/mayo.pro | 317 ---------------------------------- scripts/qmake/opencascade.pri | 38 ---- scripts/qmake/tests.pri | 26 --- scripts/qmake/version.h.in | 12 -- scripts/qmake/version.pri | 32 ---- 5 files changed, 425 deletions(-) delete mode 100644 scripts/qmake/mayo.pro delete mode 100644 scripts/qmake/opencascade.pri delete mode 100644 scripts/qmake/tests.pri delete mode 100644 scripts/qmake/version.h.in delete mode 100644 scripts/qmake/version.pri diff --git a/scripts/qmake/mayo.pro b/scripts/qmake/mayo.pro deleted file mode 100644 index 3379fada..00000000 --- a/scripts/qmake/mayo.pro +++ /dev/null @@ -1,317 +0,0 @@ -#**************************************************************************** -#* Copyright (c) 2021, Fougue Ltd. -#* All rights reserved. -#* See license at https://github.com/fougue/mayo/blob/master/LICENSE.txt -#**************************************************************************** - -TEMPLATE = app -TARGET = mayo -include(version.pri) -CONFIG(debug, debug|release) { - message(Mayo version $$MAYO_VERSION debug) -} else { - message(Mayo version $$MAYO_VERSION release) -} - -MAYO_DIR = $$PWD/../.. - -# Check Qt version -message(Qt version $$QT_VERSION) -!versionAtLeast(QT_VERSION, 5.14) { - error(Qt >= 5.14 is required but detected version is $$QT_VERSION) -} - -# If variable 'CHECK_ARCH_64' is empty then host is not 64bit -CHECK_ARCH_64 = $$find(QT_ARCH, 64) - -QT += core gui widgets -greaterThan(QT_MAJOR_VERSION, 5) { - QT += openglwidgets -} - -CONFIG += c++17 -CONFIG(debug, debug|release) { - CONFIG += console -} else { - CONFIG -= console - CONFIG += release_with_debuginfo -} - -DEFINES += \ - QT_DISABLE_DEPRECATED_BEFORE=0x050F00 \ - QT_IMPLICIT_QFILEINFO_CONSTRUCTION \ - -release_with_debuginfo:msvc { - # https://learn.microsoft.com/en-us/cpp/build/how-to-debug-a-release-build?view=msvc-170 - QMAKE_CXXFLAGS_RELEASE += /Zi - QMAKE_LFLAGS_RELEASE += /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF -} - -msvc { - DEFINES += NOMINMAX - QMAKE_CXXFLAGS += /we4150 # Deletion of pointer to incomplete type 'XXXX'; no destructor called - QMAKE_CXXFLAGS += /std:c++17 - - greaterThan(QT_MAJOR_VERSION, 5) { - DEFINES += _USE_MATH_DEFINES - } -} - -gcc|clang { - QMAKE_CXXFLAGS += -std=c++17 -} - -clang { - # Silent Clang warnings about instantiation of variable 'Mayo::GenericProperty::TypeName' - QMAKE_CXXFLAGS += -Wno-undefined-var-template - # See https://libcxx.llvm.org/docs/UsingLibcxx.html - # LIBS += -lstdc++fs -} - -unix:isEmpty(CHECK_ARCH_64) { - macx { - DEFINES += _DARWIN_USE_64_BIT_INODE - } else { - DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE64_SOURCE=1 - } - - gcc|clang:contains(QT_ARCH, arm) { - # See: - # https://stackoverflow.com/questions/48149323/what-does-the-gcc-warning-project-parameter-passing-for-x-changed-in-gcc-7-1-m - # https://stackoverflow.com/questions/52020305/what-exactly-does-gccs-wpsabi-option-do-what-are-the-implications-of-supressi - QMAKE_CXXFLAGS += -Wno-psabi - } -} - -macx { - DEFINES += GL_SILENCE_DEPRECATION - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15 - LIBS += -liconv -# QMAKE_CXXFLAGS += -mmacosx-version-min=10.15 - ICON = $$MAYO_DIR/images/appicon.icns -} - -win32 { - LIBS += -lOpengl32 -lUser32 -} - -INCLUDEPATH += \ - $$MAYO_DIR/src/app \ - $$MAYO_DIR/src/3rdparty - -HEADERS += \ - $$files($$MAYO_DIR/src/base/*.h) \ - $$files($$MAYO_DIR/src/io_dxf/*.h) \ - $$files($$MAYO_DIR/src/io_image/*.h) \ - $$files($$MAYO_DIR/src/io_occ/*.h) \ - $$files($$MAYO_DIR/src/io_off/*.h) \ - $$files($$MAYO_DIR/src/io_ply/*.h) \ - $$files($$MAYO_DIR/src/graphics/*.h) \ - $$files($$MAYO_DIR/src/gui/*.h) \ - $$files($$MAYO_DIR/src/measure/*.h) \ - $$files($$MAYO_DIR/src/app/*.h) \ - -SOURCES += \ - $$files($$MAYO_DIR/src/base/*.cpp) \ - $$files($$MAYO_DIR/src/io_dxf/*.cpp) \ - $$files($$MAYO_DIR/src/io_image/*.cpp) \ - $$files($$MAYO_DIR/src/io_occ/*.cpp) \ - $$files($$MAYO_DIR/src/io_off/*.cpp) \ - $$files($$MAYO_DIR/src/io_ply/*.cpp) \ - $$files($$MAYO_DIR/src/graphics/*.cpp) \ - $$files($$MAYO_DIR/src/gui/*.cpp) \ - $$files($$MAYO_DIR/src/measure/*.cpp) \ - $$files($$MAYO_DIR/src/app/*.cpp) \ - \ - $$MAYO_DIR/src/3rdparty/fmt/src/format.cc \ - -win32:lessThan(QT_MAJOR_VERSION, 6) { - QT += winextras - HEADERS += $$files($$MAYO_DIR/src/app/windows/*.h) - SOURCES += $$files($$MAYO_DIR/src/app/windows/*.cpp) -} - -FORMS += $$files($$MAYO_DIR/src/app/*.ui) - -RESOURCES += $$MAYO_DIR/mayo.qrc -RC_ICONS = $$MAYO_DIR/images/appicon.ico - -OTHER_FILES += \ - $$MAYO_DIR/README.md \ - $$MAYO_DIR/.github/workflows/ci_linux.yml \ - $$MAYO_DIR/.github/workflows/ci_linux_arm.yml \ - $$MAYO_DIR/.github/workflows/ci_macos.yml \ - $$MAYO_DIR/.github/workflows/ci_windows.yml \ - $$MAYO_DIR/images/credits.txt \ - $$MAYO_DIR/scripts/bump-version.rb \ - -# Embed qtbase_*.qm files as a resource -qtBaseQmRes.files = \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_fr.qm -qtBaseQmRes.base = $$[QT_INSTALL_TRANSLATIONS] -qtBaseQmRes.prefix = "/i18n" -RESOURCES += qtBaseQmRes - -# Optional developer-specific QMake pri file for environment related settings -exists($$PWD/env.pri) { - include($$PWD/env.pri) -} - -# OpenCascade -include(opencascade.pri) -!isEmpty(OCC_VERSION_STR) { - message(OpenCascade version $$OCC_VERSION_STR) -} else { - warning(OpenCascade version ) -} - -LIBS += \ - -lTKBin \ - -lTKBinL \ - -lTKBinXCAF \ - -lTKBO \ - -lTKBool \ - -lTKBRep \ - -lTKCAF \ - -lTKCDF \ - -lTKernel \ - -lTKG2d \ - -lTKG3d \ - -lTKGeomAlgo \ - -lTKGeomBase \ - -lTKHLR \ - -lTKLCAF \ - -lTKMath \ - -lTKMesh \ - -lTKMeshVS \ - -lTKOpenGl \ - -lTKPrim \ - -lTKService \ - -lTKShHealing \ - -lTKTopAlgo \ - -lTKXSDRAW \ # Seems to be required on macOS(see https://github.com/fougue/mayo/issues/41#issuecomment-742732322) - -lTKV3d \ - -lTKVCAF \ - -lTKXCAF \ - -lTKXml \ - -lTKXmlL \ - -lTKXmlXCAF \ - -lTKXSBase \ - -versionAtLeast(OCC_VERSION_STR, 7.8.0) { - # -- IGES support - LIBS += -lTKDEIGES - # -- STEP support - LIBS += -lTKDESTEP - # -- STL support - LIBS += -lTKDESTL - # -- VRML support - LIBS += -lTKDEVRML -} else { - # -- IGES support - LIBS += -lTKIGES -lTKXDEIGES - # -- STEP support - LIBS += -lTKSTEP -lTKSTEP209 -lTKSTEPAttr -lTKSTEPBase -lTKXDESTEP - # -- STL support - LIBS += -lTKSTL - # -- VRML support - LIBS += -lTKVRML - - versionAtLeast(OCC_VERSION_STR, 7.7.0) { - LIBS += -lTKXDE - } -} - -# -- OBJ/glTF support -versionAtLeast(OCC_VERSION_STR, 7.4.0) { - LIBS += -lTKRWMesh - versionAtLeast(OCC_VERSION_STR, 7.8.0) { - LIBS += -lTKDEOBJ -lTKDEGLTF - } -} else { - SOURCES -= \ - $$MAYO_DIR/src/io_occ/io_occ_base_mesh.cpp \ - $$MAYO_DIR/src/io_occ/io_occ_gltf_reader.cpp \ - $$MAYO_DIR/src/io_occ/io_occ_obj_reader.cpp - - message(glTF reader disabled because OpenCascade < v7.4) - message(OBJ reader disabled because OpenCascade < v7.4) -} - -!versionAtLeast(OCC_VERSION_STR, 7.5.0) { - SOURCES -= $$MAYO_DIR/src/io_occ/io_occ_gltf_writer.cpp - message(glTF writer disabled because OpenCascade < v7.5) -} - -!versionAtLeast(OCC_VERSION_STR, 7.6.0) { - SOURCES -= $$MAYO_DIR/src/io_occ/io_occ_obj_writer.cpp - message(OBJ writer disabled because OpenCascade < v7.6) -} - -!versionAtLeast(OCC_VERSION_STR, 7.7.0) { - SOURCES -= $$MAYO_DIR/src/io_occ/io_occ_vrml_reader.cpp - message(VRML reader disabled because OpenCascade < v7.7) -} - -# assimp -isEmpty(ASSIMP_INC_DIR) | isEmpty(ASSIMP_LIB_DIR) { - message(assimp OFF) -} else { - !versionAtLeast(OCC_VERSION_STR, 7.5.0) { - message(assimp reader disabled because OpenCascade < v7.5) - } - else { - message(assimp ON) - ASSIMP_IS_ON = 1 - } -} - -defined(ASSIMP_IS_ON, var) { - HEADERS += $$files($$MAYO_DIR/src/io_assimp/*.h) - SOURCES += $$files($$MAYO_DIR/src/io_assimp/*.cpp) - - ASSIMP_VERSION_FILE_CONTENTS = $$cat($$ASSIMP_INC_DIR/version.h, lines) - ASSIMP_aiGetVersionPatch = $$find(ASSIMP_VERSION_FILE_CONTENTS, aiGetVersionPatch) - !isEmpty(ASSIMP_aiGetVersionPatch) { - } else { - DEFINES += NO_ASSIMP_aiGetVersionPatch - message(Assimp function aiGetVersionPatch() not available) - } - - INCLUDEPATH += $$ASSIMP_INC_DIR/.. - LIBS += -L$$ASSIMP_LIB_DIR -lassimp$$ASSIMP_LIBNAME_SUFFIX - DEFINES += HAVE_ASSIMP -} - -# gmio -isEmpty(GMIO_ROOT) { - message(gmio OFF) -} else { - message(gmio ON) - CONFIG(debug, debug|release) { - #GMIO_BIN_SUFFIX = d - GMIO_BIN_SUFFIX = - } else { - GMIO_BIN_SUFFIX = - } - - HEADERS += $$files($$MAYO_DIR/src/io_gmio/*.h) - SOURCES += $$files($$MAYO_DIR/src/io_gmio/*.cpp) - - INCLUDEPATH += $$GMIO_ROOT/include - LIBS += -L$$GMIO_ROOT/lib -lgmio_static -lzlibstatic - SOURCES += $$GMIO_ROOT/src/gmio_support/stream_qt.cpp - DEFINES += HAVE_GMIO -} - -# Unit tests -CONFIG(withtests) { - include($$MAYO_DIR/tests/tests.pri) - DEFINES += MAYO_WITH_TESTS -} - -# Optional developer-specific QMake pri file for custom processing -exists($$PWD/custom.pri) { - include($$PWD/custom.pri) -} diff --git a/scripts/qmake/opencascade.pri b/scripts/qmake/opencascade.pri deleted file mode 100644 index 26ea5787..00000000 --- a/scripts/qmake/opencascade.pri +++ /dev/null @@ -1,38 +0,0 @@ -#**************************************************************************** -#* Copyright (c) 2021, Fougue Ltd. -#* All rights reserved. -#* See license at https://github.com/fougue/mayo/blob/master/LICENSE.txt -#**************************************************************************** - -# Declare pure QMake variables out of OCC envvars -isEmpty(CASCADE_INC_DIR):CASCADE_INC_DIR = $$(CSF_OCCTIncludePath) -isEmpty(CASCADE_LIB_DIR):CASCADE_LIB_DIR = $$(CSF_OCCTLibPath) -isEmpty(CASCADE_BIN_DIR):CASCADE_BIN_DIR = $$(CSF_OCCTBinPath) -isEmpty(CASCADE_SRC_DIR):CASCADE_SRC_DIR = $$(CSF_OCCTResourcePath) -equals(QT_ARCH, i386) { - isEmpty(CASCADE_OPTBIN_DIRS):CASCADE_OPTBIN_DIRS = $$(CSF_OPT_BIN32) -} else:equals(QT_ARCH, x86_64) { - isEmpty(CASCADE_OPTBIN_DIRS):CASCADE_OPTBIN_DIRS = $$(CSF_OPT_BIN64) -} -isEmpty(CASCADE_DEFINES):CASCADE_DEFINES = $$(CSF_DEFINES) - -INCLUDEPATH += $$CASCADE_INC_DIR - -DEFINES += $$split(CASCADE_DEFINES, ;) -DEFINES += OCCT_HANDLE_NOCAST -linux:DEFINES += OCC_CONVERT_SIGNALS - -# Find OCC version -OCC_VERSION_FILE_CONTENTS = $$cat($$CASCADE_INC_DIR/Standard_Version.hxx, lines) - -OCC_VERSION_MAJOR = $$find(OCC_VERSION_FILE_CONTENTS, OCC_VERSION_MAJOR\s+[0-9]+) -OCC_VERSION_MAJOR = $$section(OCC_VERSION_MAJOR, " ", -1) -OCC_VERSION_MINOR = $$find(OCC_VERSION_FILE_CONTENTS, OCC_VERSION_MINOR\s+[0-9]+) -OCC_VERSION_MINOR = $$section(OCC_VERSION_MINOR, " ", -1) -OCC_VERSION_PATCH = $$find(OCC_VERSION_FILE_CONTENTS, OCC_VERSION_MAINTENANCE\s+[0-9]+) -OCC_VERSION_PATCH = $$section(OCC_VERSION_PATCH, " ", -1) - -OCC_VERSION_STR = $$join($$list($$OCC_VERSION_MAJOR, $$OCC_VERSION_MINOR, $$OCC_VERSION_PATCH), .) - -LIBS += $$system_path($$join(CASCADE_LIB_DIR, " -L", -L)) -QMAKE_RPATHDIR += $$CASCADE_LIB_DIR diff --git a/scripts/qmake/tests.pri b/scripts/qmake/tests.pri deleted file mode 100644 index 87401ef9..00000000 --- a/scripts/qmake/tests.pri +++ /dev/null @@ -1,26 +0,0 @@ -#**************************************************************************** -#* Copyright (c) 2022, Fougue Ltd. -#* All rights reserved. -#* See license at https://github.com/fougue/mayo/blob/master/LICENSE.txt -#**************************************************************************** - -QT += testlib - -HEADERS += \ - $$PWD/test_app.h \ - $$PWD/test_base.h \ - $$PWD/test_measure.h \ - -SOURCES += \ - $$PWD/runtests.cpp \ - $$PWD/test_app.cpp \ - $$PWD/test_base.cpp \ - $$PWD/test_measure.cpp \ - -# Copy input files -CONFIG += file_copies -COPIES += MayoTestsInputs -MayoTestsInputs.files = $$files($$PWD/inputs/*.*) -MayoTestsInputs.path = $$OUT_PWD/tests/inputs - -mkpath($$OUT_PWD/tests/outputs) diff --git a/scripts/qmake/version.h.in b/scripts/qmake/version.h.in deleted file mode 100644 index 18773f5b..00000000 --- a/scripts/qmake/version.h.in +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -namespace Mayo { - -const char strVersion[] = \"$$MAYO_VERSION\"; -const char strVersionCommitId[] = \"$$MAYO_VERSION_COMMIT\"; -const unsigned versionRevisionNumber = $$MAYO_VERSION_REVNUM; -const unsigned versionMajor = $$MAYO_VERSION_MAJ; -const unsigned versionMinor = $$MAYO_VERSION_MIN; -const unsigned versionPatch = $$MAYO_VERSION_PAT; - -} // namespace Mayo diff --git a/scripts/qmake/version.pri b/scripts/qmake/version.pri deleted file mode 100644 index 263b6ecd..00000000 --- a/scripts/qmake/version.pri +++ /dev/null @@ -1,32 +0,0 @@ -system(git --version):HAVE_GIT=1 -defined(HAVE_GIT, var) { - MAYO_VERSION_COMMIT = $$system(git rev-parse --short HEAD) - MAYO_VERSION_REVNUM = $$system(git rev-list --count HEAD) -} else { - MAYO_VERSION_COMMIT = ?? - MAYO_VERSION_REVNUM = 0 - warning("Git is not in PATH, cannot find commit ID nor revision number") -} - -MAYO_VERSION_MAJ = 0 -MAYO_VERSION_MIN = 9 -MAYO_VERSION_PAT = 0 -VERSION = $${MAYO_VERSION_MAJ}.$${MAYO_VERSION_MIN}.$${MAYO_VERSION_PAT} -MAYO_VERSION = $${VERSION} - -equals(QT_ARCH, i386) { - VERSION_TARGET_ARCH = x86 -} else:equals(QT_ARCH, x86_64) { - VERSION_TARGET_ARCH = x64 -} else { - VERSION_TARGET_ARCH = $$QT_ARCH -} - -QMAKE_TARGET_PRODUCT = Mayo -QMAKE_TARGET_COMPANY = Fougue - -# Generate version file -QMAKE_SUBSTITUTES += $$PWD/version.h.in - -INCLUDEPATH += $$OUT_PWD # To allow inclusion as "version.h" from source code -OTHER_FILES += $$PWD/version.h.in