diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ca2be577..9de4aa333 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,15 +137,21 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + with: + vs-version: 'latest' - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1.2 + uses: Chocobo1/setup-ccache-action@v1 with: - key: ccache-${{ github.job }} - max-size: 2G - variant: sccache + windows_compile_environment: msvc + - name: Setup ninja + uses: seanmiddleditch/gha-setup-ninja@v6 + - name: Setup MSVC for Ninja again + uses: ilammy/msvc-dev-cmd@v1 - name: Build run: | - cmake -S . -B build -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_BUILD_TYPE=Release + cmake -S . -B build -G Ninja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release cmake --build build --parallel --config Release - name: Test run: | diff --git a/app/Graph/CMakeLists.txt b/app/Graph/CMakeLists.txt index b5f2bc416..17389c88a 100644 --- a/app/Graph/CMakeLists.txt +++ b/app/Graph/CMakeLists.txt @@ -26,28 +26,16 @@ if (NOT CMAKE_BUILD_TYPE) endif() if (WIN32) - if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") - set(CMAKE_BUILD_TYPE "Debug") - endif() - if ("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE") - set(CMAKE_BUILD_TYPE "Release") - endif() add_custom_command(TARGET Graph_Build POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory - "${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/." + "${OPENCV_BUILD_DIR}/bin/." "${CMAKE_BINARY_DIR}/bin/") endif() if (WIN32) - if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") - set(CMAKE_BUILD_TYPE "Debug") - endif() - if ("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE") - set(CMAKE_BUILD_TYPE "Release") - endif() add_custom_command(TARGET ACC_MNIST POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory - "${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/." + "${OPENCV_BUILD_DIR}/bin/." "${CMAKE_BINARY_DIR}/bin/") endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index dc4df1bb7..ad85d05d3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,15 +18,9 @@ if (NOT CMAKE_BUILD_TYPE) endif() if (WIN32) - if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") - set(CMAKE_BUILD_TYPE "Debug") - endif() - if ("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE") - set(CMAKE_BUILD_TYPE "Release") - endif() add_custom_command(TARGET run_test POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory - "${OPENCV_BUILD_DIR}/bin/${CMAKE_BUILD_TYPE}/." + "${OPENCV_BUILD_DIR}/bin/." "${CMAKE_BINARY_DIR}/bin/") endif()