From 6c8ec38248830f8408dde5c8c145889eb123e1f5 Mon Sep 17 00:00:00 2001 From: Ioannis Tsakpinis Date: Sat, 27 Feb 2021 17:06:00 +0200 Subject: [PATCH] LWJGL CI configuration --- .gitattributes | 2 + .github/workflows/ccpp.yml | 105 ------------- .github/workflows/cifuzz.yml | 26 ---- .github/workflows/inno_setup | 51 ------- .github/workflows/lwjgl.yml | 244 ++++++++++++++++++++++++++++++ .github/workflows/sanitizer.yml | 69 --------- CMakeLists.txt | 4 +- code/AssetLib/FBX/FBXImporter.cpp | 2 +- code/CMakeLists.txt | 11 +- code/Common/StbCommon.h | 3 + 10 files changed, 261 insertions(+), 256 deletions(-) delete mode 100644 .github/workflows/ccpp.yml delete mode 100644 .github/workflows/cifuzz.yml delete mode 100644 .github/workflows/inno_setup create mode 100644 .github/workflows/lwjgl.yml delete mode 100644 .github/workflows/sanitizer.yml diff --git a/.gitattributes b/.gitattributes index f3df90d3887..3f97bde26f1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ +* -text + # Declare files that will always have LF line endings on checkout. *.cpp text eol=lf *.h text eol=lf diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml deleted file mode 100644 index db152b813d1..00000000000 --- a/.github/workflows/ccpp.yml +++ /dev/null @@ -1,105 +0,0 @@ -name: C/C++ CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -permissions: - contents: read # to fetch code (actions/checkout) - -jobs: - job: - name: ${{ matrix.name }}-build-and-test - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++] - # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux. - include: - - name: windows-latest-cl.exe - os: windows-latest - cxx: cl.exe - cc: cl.exe - - name: ubuntu-latest-clang++ - os: ubuntu-latest - cxx: clang++ - cc: clang - - name: macos-latest-clang++ - os: macos-latest - cxx: clang++ - cc: clang - - name: ubuntu-latest-g++ - os: ubuntu-latest - cxx: g++ - cc: gcc - - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - - uses: lukka/get-cmake@latest - - - uses: ilammy/msvc-dev-cmd@v1 - - - name: Set Compiler Environment - uses: lukka/set-shell-env@v1 - with: - CXX: ${{ matrix.cxx }} - CC: ${{ matrix.cc }} - - - name: Cache DX SDK - id: dxcache - if: contains(matrix.name, 'windows') - uses: actions/cache@v4 - with: - path: '${{ github.workspace }}/DX_SDK' - key: ${{ runner.os }}-DX_SDK - restore-keys: | - ${{ runner.os }}-DX_SDK - - - name: Download DXSetup - if: contains(matrix.name, 'windows') && steps.dxcache.outputs.cache-hit != 'true' - run: | - curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe - cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK" - - - name: Set Windows specific CMake arguments - if: contains(matrix.name, 'windows') - id: windows_extra_cmake_args - run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1" - - - name: Set Hunter specific CMake arguments - if: contains(matrix.name, 'hunter') - id: hunter_extra_cmake_args - run: echo "::set-output name=args::-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake" - - - name: configure and build - uses: lukka/run-cmake@v3 - env: - DXSDK_DIR: '${{ github.workspace }}/DX_SDK' - - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' - cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}' - buildWithCMakeArgs: '--parallel 24 -v' - buildDirectory: '${{ github.workspace }}/build/' - - - name: Exclude certain tests in Hunter specific builds - if: contains(matrix.name, 'hunter') - id: hunter_extra_test_args - run: echo "::set-output name=args::--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest" - - - name: test - run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }} - shell: bash - - - uses: actions/upload-artifact@v4 - if: matrix.name == 'windows-msvc' - with: - name: 'assimp-bins-${{ matrix.name }}-${{ github.sha }}' - path: build/bin diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml deleted file mode 100644 index 38f54ce0616..00000000000 --- a/.github/workflows/cifuzz.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: CIFuzz -on: [pull_request] -jobs: - Fuzzing: - runs-on: ubuntu-latest - steps: - - name: Build Fuzzers - id: build - uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master - with: - oss-fuzz-project-name: 'assimp' - dry-run: false - language: c++ - - name: Run Fuzzers - uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master - with: - oss-fuzz-project-name: 'assimp' - fuzz-seconds: 300 - dry-run: false - language: c++ - - name: Upload Crash - uses: actions/upload-artifact@v4 - if: failure() && steps.build.outcome == 'success' - with: - name: artifacts - path: ./out/artifacts diff --git a/.github/workflows/inno_setup b/.github/workflows/inno_setup deleted file mode 100644 index 0bfef0cd35f..00000000000 --- a/.github/workflows/inno_setup +++ /dev/null @@ -1,51 +0,0 @@ -name: Build Windows Installer -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] -jobs: - build: - name: Build the Inno Setup Installer - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - uses: lukka/get-cmake@latest - - uses: ilammy/msvc-dev-cmd@v1 - - - - name: Cache DX SDK - id: dxcache - uses: actions/cache@v4 - with: - path: '${{ github.workspace }}/DX_SDK' - key: ${{ runner.os }}-DX_SDK - restore-keys: | - ${{ runner.os }}-DX_SDK - - - name: Download DXSetup - run: | - curl -s -o DXSDK_Jun10.exe --location https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe - cmd.exe /c start /wait .\DXSDK_Jun10.exe /U /O /F /S /P "${{ github.workspace }}\DX_SDK" - - - name: Set Windows specific CMake arguments - id: windows_extra_cmake_args - run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1" - - - name: configure and build - uses: lukka/run-cmake@v3 - env: - DXSDK_DIR: '${{ github.workspace }}/DX_SDK' - - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' - cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}' - buildWithCMakeArgs: '--parallel 24 -v' - buildDirectory: '${{ github.workspace }}/build/' - - - name: Compile .ISS to .EXE Installer - uses: Minionguyjpro/Inno-Setup-Action@v1.2.2 - with: - path: packaging/windows-innosetup/script_x64.iss - options: /O+ diff --git a/.github/workflows/lwjgl.yml b/.github/workflows/lwjgl.yml new file mode 100644 index 00000000000..e8177da54a1 --- /dev/null +++ b/.github/workflows/lwjgl.yml @@ -0,0 +1,244 @@ +name: LWJGL Build + +on: + push: + branches: + - master + +env: + AWS_DEFAULT_REGION: us-east-1 + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + S3_PARAMS: --cache-control "public,must-revalidate,proxy-revalidate,max-age=0" + +jobs: + linux: + name: Linux + runs-on: ubuntu-latest + container: + image: centos:7 + strategy: + fail-fast: false + matrix: + ARCH: [x64] + include: + - ARCH: x64 + defaults: + run: + shell: bash + env: + ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true + steps: + - name: Upgrade git + run: | + sed -i \ + -e 's/^mirrorlist/#mirrorlist/' \ + -e 's/^#baseurl/baseurl/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ + /etc/yum.repos.d/*.repo + yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm + yum -y install git + - uses: actions/checkout@v3 + with: + fetch-depth: 3 + - name: Configure yum + run: | + yum -y install epel-release + yum -y update + - name: Install build dependencies + run: | + yum -y install centos-release-scl + sed -i \ + -e 's/^mirrorlist/#mirrorlist/' \ + -e 's/^#baseurl/baseurl/' \ + -e 's/^# baseurl/baseurl/' \ + -e 's/mirror\.centos\.org/vault.centos.org/' \ + /etc/yum.repos.d/CentOS-SCLo-scl*.repo + yum -y install devtoolset-11-gcc-c++ + yum -y install cmake3 awscli + - name: Configure build + run: | + source scl_source enable devtoolset-11 || true + cmake3 -B build -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_DRACO=ON -DASSIMP_BUILD_ZLIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" + - name: Build + run: | + source scl_source enable devtoolset-11 || true + cmake3 --build build + strip build/bin/libassimp.so + strip build/bin/libdraco.so + - name: Upload artifact + run: | + aws s3 cp build/bin/libassimp.so s3://lwjgl-build/nightly/linux/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + aws s3 cp build/bin/libdraco.so s3://lwjgl-build/nightly/linux/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + - name: Upload git revision + run: | + git config --global --add safe.directory $PWD + git log --first-parent --pretty=format:%H HEAD~2..HEAD~1 > libassimp.so.git + aws s3 cp libassimp.so.git s3://lwjgl-build/nightly/linux/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + + linux-cross: + name: Linux Cross + runs-on: ubuntu-22.04 + strategy: + fail-fast: false + matrix: + ARCH: [arm32, arm64, ppc64le, riscv64] + include: + - ARCH: arm32 + CROSS_ARCH: armhf + TRIPLET: arm-linux-gnueabihf + - ARCH: arm64 + CROSS_ARCH: arm64 + TRIPLET: aarch64-linux-gnu + - ARCH: ppc64le + CROSS_ARCH: ppc64el + TRIPLET: powerpc64le-linux-gnu + - ARCH: riscv64 + CROSS_ARCH: riscv64 + TRIPLET: riscv64-linux-gnu + env: + LWJGL_ARCH: ${{matrix.ARCH}} + defaults: + run: + shell: bash + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 3 + - name: Install dependencies + run: | + DEBIAN_FRONTEND=noninteractive sudo apt-get -yq update + DEBIAN_FRONTEND=noninteractive sudo apt-get -yq install cmake gcc-${{matrix.TRIPLET}} g++-${{matrix.TRIPLET}} libc6-dev-${{matrix.CROSS_ARCH}}-cross + - name: Prepare cross-compilation for ${{matrix.CROSS_ARCH}} + run: | + sudo sed -i 's/deb mirror/deb [arch=amd64,i386] mirror/' /etc/apt/sources.list + sudo grep "mirror+file" /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/ports.list + sudo sed -i 's/amd64,i386/${{matrix.CROSS_ARCH}}/' /etc/apt/sources.list.d/ports.list + sudo sed -i 's#mirror+file:/etc/apt/apt-mirrors.txt#http://ports.ubuntu.com/ubuntu-ports/#' /etc/apt/sources.list.d/ports.list + sudo dpkg --add-architecture ${{matrix.CROSS_ARCH}} + sudo apt-get update || true + - name: Install cross-compilation dependencies + run: sudo apt-get -yq --allow-unauthenticated --no-install-suggests --no-install-recommends install zlib1g-dev:${{matrix.CROSS_ARCH}} libc6-dev:${{matrix.CROSS_ARCH}} -o Dpkg::Options::="--force-overwrite" + - name: Configure build + run: CC=${{matrix.TRIPLET}}-gcc CXX=${{matrix.TRIPLET}}-g++ cmake -B build -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_DRACO=ON -DASSIMP_BUILD_ZLIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" + - name: Build + run: | + cmake --build build + ${{matrix.TRIPLET}}-strip build/bin/libassimp.so + ${{matrix.TRIPLET}}-strip build/bin/libdraco.so + - name: Upload artifacts + run: | + aws s3 cp build/bin/libassimp.so s3://lwjgl-build/nightly/linux/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + aws s3 cp build/bin/libdraco.so s3://lwjgl-build/nightly/linux/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + - name: Upload git revision + run: | + git config --global --add safe.directory $(pwd) + git log --first-parent --pretty=format:%H HEAD~2..HEAD~1 > libassimp.so.git + aws s3 cp libassimp.so.git s3://lwjgl-build/nightly/linux/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + + freebsd-cross: + name: FreeBSD Cross + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 3 + - name: Build + uses: cross-platform-actions/action@v0.24.0 + with: + operating_system: freebsd + architecture: x86-64 + version: '13.2' + memory: 4G + shell: bash + run: | + sudo pkg install -y cmake + cmake -B build -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_DRACO=ON -DASSIMP_BUILD_ZLIB=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" + cmake --build build + strip build/bin/libassimp.so + strip build/bin/libdraco.so + - name: Upload artifact + run: | + aws s3 cp build/bin/libassimp.so s3://lwjgl-build/nightly/freebsd/x64/ ${{env.S3_PARAMS}} + aws s3 cp build/bin/libdraco.so s3://lwjgl-build/nightly/freebsd/x64/ ${{env.S3_PARAMS}} + - name: Upload git revision + run: | + git config --global --add safe.directory $PWD + git log --first-parent --pretty=format:%H HEAD~2..HEAD~1 > libassimp.so.git + aws s3 cp libassimp.so.git s3://lwjgl-build/nightly/freebsd/x64/ ${{env.S3_PARAMS}} + + macos: + name: macOS + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + ARCH: [x64, arm64] + include: + - ARCH: x64 + CMAKE_PARAMS: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DCMAKE_OSX_ARCHITECTURES=x86_64 + - ARCH: arm64 + CMAKE_PARAMS: -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_OSX_ARCHITECTURES=arm64 + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 3 + - name: Configure build + run: | + mkdir build + cd build + cmake -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_DRACO=ON -DASSIMP_BUILD_ZLIB=ON -DCMAKE_BUILD_TYPE=Release ${{matrix.CMAKE_PARAMS}} .. + - name: Build + run: | + cd build + cmake --build . + strip -u -r bin/libassimp.dylib + strip -u -r bin/libdraco.dylib + - name: Upload artifacts + run: | + aws s3 cp build/bin/libassimp.dylib s3://lwjgl-build/nightly/macosx/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + aws s3 cp build/bin/libdraco.dylib s3://lwjgl-build/nightly/macosx/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + - name: Upload git revision + run: | + git log --first-parent --pretty=format:%H HEAD~2..HEAD~1 > libassimp.dylib.git + aws s3 cp libassimp.dylib.git s3://lwjgl-build/nightly/macosx/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + + windows: + name: Windows + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + ARCH: [x86, x64, arm64] + include: + - ARCH: x86 + PLATFORM: Win32 + - ARCH: x64 + PLATFORM: x64 + - ARCH: arm64 + PLATFORM: ARM64 + defaults: + run: + shell: cmd + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 3 + # disabled Link Time Optimization for Draco + - name: Configure build + run: | + mkdir build + cd build + cmake -G "Visual Studio 17 2022" -A ${{matrix.PLATFORM}} -T ClangCL -DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_BUILD_DRACO=ON -DASSIMP_BUILD_ZLIB=ON -DCMAKE_C_FLAGS_RELEASE="/MT /EHsc /Ox /GF /Gy /GS- /DNDEBUG" -DCMAKE_CXX_FLAGS_RELEASE="/MT /EHsc /Ox /GF /Gy /GS- /DNDEBUG" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/OPT:REF,ICF /INCREMENTAL:NO" .. + - name: Build + run: | + cd build + cmake --build . --config Release + - name: Upload artifacts + run: | + aws s3 cp build\bin\Release\assimp-vc143-mt.dll s3://lwjgl-build/nightly/windows/${{matrix.ARCH}}/assimp.dll ${{env.S3_PARAMS}} + aws s3 cp build\bin\Release\draco.dll s3://lwjgl-build/nightly/windows/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} + - name: Upload git revision + run: | + git log --first-parent --pretty=format:%%H HEAD~2..HEAD~1 > assimp.dll.git + aws s3 cp assimp.dll.git s3://lwjgl-build/nightly/windows/${{matrix.ARCH}}/ ${{env.S3_PARAMS}} diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml deleted file mode 100644 index 6a8e2336f83..00000000000 --- a/.github/workflows/sanitizer.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: C/C++ Sanitizer - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -permissions: - contents: read # to fetch code (actions/checkout) - -jobs: - job1: - name: adress-sanitizer - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: lukka/get-cmake@latest - - uses: lukka/set-shell-env@v1 - with: - CXX: clang++ - CC: clang - - - name: configure and build - uses: lukka/run-cmake@v3 - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' - cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Debug -DASSIMP_ASAN=ON' - buildWithCMakeArgs: '-- -v' - buildDirectory: '${{ github.workspace }}/build/' - - - name: test - run: cd build/bin && ./unit - shell: bash - - job2: - name: undefined-behavior-sanitizer - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: lukka/get-cmake@latest - - uses: lukka/set-shell-env@v1 - with: - CXX: clang++ - CC: clang - - - name: configure and build - uses: lukka/run-cmake@v3 - with: - cmakeListsOrSettingsJson: CMakeListsTxtAdvanced - cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' - cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Debug -DASSIMP_UBSAN=ON' - buildWithCMakeArgs: '-- -v' - buildDirectory: '${{ github.workspace }}/build/' - - - name: test - run: cd build/bin && ./unit - shell: bash - - job3: - name: printf-sanitizer - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: run scan_printf script - run: ./scripts/scan_printf.sh - shell: bash diff --git a/CMakeLists.txt b/CMakeLists.txt index 619cd0ce385..516b00ee978 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ SET(CMAKE_POLICY_DEFAULT_CMP0012 NEW) SET(CMAKE_POLICY_DEFAULT_CMP0074 NEW) SET(CMAKE_POLICY_DEFAULT_CMP0092 NEW) -CMAKE_MINIMUM_REQUIRED( VERSION 3.22 ) +CMAKE_MINIMUM_REQUIRED( VERSION 3.17 ) # Experimental USD importer: disabled, need to opt-in # Note: assimp github PR automatic checks will fail the PR due to compiler warnings in @@ -305,7 +305,7 @@ ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) IF(NOT ASSIMP_HUNTER_ENABLED) SET(CMAKE_POSITION_INDEPENDENT_CODE ON) ENDIF() - SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long ${CMAKE_CXX_FLAGS}" ) + SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long -Wno-implicit-const-int-float-conversion ${CMAKE_CXX_FLAGS}" ) SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}") ELSEIF( MINGW ) IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) diff --git a/code/AssetLib/FBX/FBXImporter.cpp b/code/AssetLib/FBX/FBXImporter.cpp index 3a8fb8b8aa5..e8022b1a20f 100644 --- a/code/AssetLib/FBX/FBXImporter.cpp +++ b/code/AssetLib/FBX/FBXImporter.cpp @@ -90,7 +90,7 @@ namespace { // Returns whether the class can handle the format of the given file. bool FBXImporter::CanRead(const std::string & pFile, IOSystem * pIOHandler, bool /*checkSig*/) const { // at least ASCII-FBX files usually have a 'FBX' somewhere in their head - static const char *tokens[] = { " \n\r\n " }; + static const char *tokens[] = { "fbx" }; return SearchFileHeaderForToken(pIOHandler, pFile, tokens, AI_COUNT_OF(tokens)); } diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index e4e67e68200..18ce6048db3 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -42,7 +42,7 @@ # 3) Add libassimp using the file lists (eliminates duplication of file names between # source groups and library command) # -cmake_minimum_required( VERSION 3.22 ) +cmake_minimum_required( VERSION 3.17 ) SET( HEADER_PATH ../include/assimp ) if(NOT ANDROID AND ASSIMP_ANDROID_JNIIOSYSTEM) @@ -1348,7 +1348,8 @@ IF (ASSIMP_WARNINGS_AS_ERRORS) IF (MSVC) IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl - TARGET_COMPILE_OPTIONS(assimp PRIVATE -Wall -Werror + #TARGET_COMPILE_OPTIONS(assimp PRIVATE -Wall -Werror + TARGET_COMPILE_OPTIONS(assimp PRIVATE -Wall -Wno-microsoft-enum-value -Wno-switch-enum -Wno-covered-switch-default @@ -1396,6 +1397,12 @@ IF (ASSIMP_WARNINGS_AS_ERRORS) -Wno-unused-template -Wno-undefined-func-template -Wno-declaration-after-statement + -Wno-unsafe-buffer-usage + -Wno-newline-eof + -Wno-ignored-qualifiers + -Wno-shorten-64-to-32 + -Wno-unused-function + -Wno-unreachable-code-break ) ELSE() TARGET_COMPILE_OPTIONS(assimp PRIVATE /W4 /WX) diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h index aef23ce1705..32d8d305c6c 100644 --- a/code/Common/StbCommon.h +++ b/code/Common/StbCommon.h @@ -46,6 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #else #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-function" +#if !defined(__clang__) +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif #endif #if defined(__clang__)