diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0b45fa8..f869140 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,11 +41,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -81,4 +81,4 @@ jobs: run: cmake --build . --config $BUILD_TYPE - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index d916fd9..e323ccb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -18,7 +18,7 @@ jobs: runs-on: macOS-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Create Build Environment run: cmake -E make_directory ${{github.workspace}}/build diff --git a/.github/workflows/static_check.yml b/.github/workflows/static_check.yml index 7c79f7f..08cfcdb 100644 --- a/.github/workflows/static_check.yml +++ b/.github/workflows/static_check.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Install OpenCV run: | @@ -24,10 +24,10 @@ jobs: - name: Configure CMake shell: bash working-directory: ${{github.workspace}}/build - run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + run: cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON - name: Upload Compile Commands - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: compile_commands path: ${{github.workspace}}/build/compile_commands.json @@ -46,7 +46,7 @@ jobs: -export-fixes ${{github.workspace}}/clang-tidy-fixes.yaml - name: Upload Clang Tidy Result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: clang_tidy_fixes path: ${{github.workspace}}/clang-tidy-fixes.yaml @@ -58,10 +58,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Download Compile Commands - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: compile_commands @@ -78,7 +78,7 @@ jobs: --output-file=${{github.workspace}}/cppcheck-report.txt . - name: Upload CppCheck Result - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: cppcheck_report path: ${{github.workspace}}/cppcheck-report.txt diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ee7dbc8..4640f17 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Install OpenCV run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bfdc1db..06d2c38 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,7 +18,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Create Build Environment run: cmake -E make_directory ${{github.workspace}}/build diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index ffe0e25..cae9ef1 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -8,10 +8,17 @@ set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external) ExternalProject_Add(opencv GIT_REPOSITORY https://github.com/opencv/opencv.git - GIT_TAG 4.5.0 + GIT_TAG 4.6.0 INSTALL_DIR ${EXTERNAL_INSTALL_LOCATION} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION} + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 + -DBUILD_ZLIB=OFF + -DBUILD_PNG=OFF + -DBUILD_JPEG=OFF + -DBUILD_TIFF=OFF + -DBUILD_WEBP=OFF + -DBUILD_OPENJPEG=OFF -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_PERF_TESTS=OFF @@ -22,4 +29,5 @@ ExternalProject_Add(opencv -DBUILD_opencv_python3=OFF -DBUILD_PROTOBUF=OFF -DBUILD_opencv_dnn=OFF + -DBUILD_JAVA=OFF ) diff --git a/traincascade/CMakeLists.txt b/traincascade/CMakeLists.txt index 3f801a5..479514a 100644 --- a/traincascade/CMakeLists.txt +++ b/traincascade/CMakeLists.txt @@ -92,7 +92,40 @@ target_compile_options( ${PROJECT_NAME} PRIVATE $<$:/W4 /WX> + $<$:/Zc:__cplusplus /Zc:preprocessor /Zc:inline> + $<$:/w14191 /w14242 /w14254 /w14263 /w14265 /w14266 /w14287> + $<$:/w14289 /w14296 /w14311 /w14545 /w14546 /w14547 /w14549> + $<$:/w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928> + # $<$:/w14365> # Fix in code + $<$:/w14062 /w14061 /w15262 /w14463 /w14146> + $<$:/w14456 /w14457 /w14458 /w14459> + $<$:/w14700 /w14701 /w14703 /w14774 /w14777> $<$>:-Wall -Wextra -Wpedantic -Werror> + # $<$>:-Wold-style-cast> # Fix in code + $<$>:-Wcast-qual> + # $<$>:-Wsign-conversion> # Fix in code + # $<$>:-Wconversion> # Fix in code + $<$>:-Wshadow -Wnull-dereference -Wmisleading-indentation> + $<$>:-Wimplicit-fallthrough -Wswitch-enum> + $<$>:-Wshift-negative-value> + $<$>:-Wformat=2 -Wformat-security> + $<$>:-fstrict-aliasing> + $<$>:-Wstack-protector -fstack-protector-strong> + $<$>:-Wnon-virtual-dtor -Woverloaded-virtual> + $<$>:-Wuninitialized> + $<$>:-Walloca -Wvla> + $<$:-Wcast-align=strict> + $<$:-Warith-conversion> + $<$:-Wduplicated-branches> + $<$:-Wduplicated-cond> + $<$:-Wlogical-op> + $<$:-Wshift-overflow=2> + $<$:-Wstrict-aliasing=3> + $<$:-Wmaybe-uninitialized> + $<$:-Wcast-align> + $<$:-Wlogical-op-parentheses> + $<$:-Wshift-overflow> + $<$:-Wconditional-uninitialized -Wsometimes-uninitialized> ) target_include_directories( @@ -127,7 +160,40 @@ target_compile_options( test_traincascade PRIVATE $<$:/W4 /WX> + $<$:/Zc:__cplusplus /Zc:preprocessor /Zc:inline> + $<$:/w14191 /w14242 /w14254 /w14263 /w14265 /w14266 /w14287> + $<$:/w14289 /w14296 /w14311 /w14545 /w14546 /w14547 /w14549> + $<$:/w14555 /w14619 /w14640 /w14826 /w14905 /w14906 /w14928> + $<$:/w14365> + $<$:/w14062 /w14061 /w15262 /w14463 /w14146> + $<$:/w14456 /w14457 /w14458 /w14459> + $<$:/w14700 /w14701 /w14703 /w14774 /w14777> $<$>:-Wall -Wextra -Wpedantic -Werror> + $<$>:-Wold-style-cast> + $<$>:-Wcast-qual> + $<$>:-Wsign-conversion> + $<$>:-Wconversion> + $<$>:-Wshadow -Wnull-dereference -Wmisleading-indentation> + $<$>:-Wimplicit-fallthrough -Wswitch-enum> + $<$>:-Wshift-negative-value> + $<$>:-Wformat=2 -Wformat-security> + $<$>:-fstrict-aliasing> + $<$>:-Wstack-protector -fstack-protector-strong> + $<$>:-Wnon-virtual-dtor -Woverloaded-virtual> + $<$>:-Wuninitialized> + $<$>:-Walloca -Wvla> + $<$:-Wcast-align=strict> + $<$:-Warith-conversion> + $<$:-Wduplicated-branches> + $<$:-Wduplicated-cond> + $<$:-Wlogical-op> + $<$:-Wshift-overflow=2> + $<$:-Wstrict-aliasing=3> + $<$:-Wmaybe-uninitialized> + $<$:-Wcast-align> + $<$:-Wlogical-op-parentheses> + $<$:-Wshift-overflow> + $<$:-Wconditional-uninitialized -Wsometimes-uninitialized> ) target_include_directories(