diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf4c38c..6e61a87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,6 @@ jobs: brew install \ autoconf \ automake \ - ninja \ pkg-config \ sdl2 \ ${NULL+} @@ -58,7 +57,6 @@ jobs: automake \ cmake \ libsdl2-dev \ - ninja-build \ pkg-config \ ${NULL+} @@ -71,8 +69,8 @@ jobs: .github/fetch_sdl_vc.ps1 echo "SDL2_DIR=$Env:GITHUB_WORKSPACE/SDL2-devel-VC" >> $Env:GITHUB_ENV - name: Setup Ninja for MSVC - if: "matrix.platform.msvc" - uses: ashutoshvarma/setup-ninja@master + if: ${{ !contains(matrix.platform.shell, 'msys2') }} + uses: aseprite/get-ninja@main with: version: 1.10.2 - uses: ilammy/msvc-dev-cmd@v1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a9c738..291959e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,18 +118,14 @@ set_target_properties(SDL2_net PROPERTIES if(NOT ANDROID) set_target_properties(SDL2_net PROPERTIES DEBUG_POSTFIX "${SDL2NET_DEBUG_POSTFIX}" + SOVERSION "${LT_MAJOR}" + VERSION "${LT_VERSION}" ) if(APPLE) - # the SOVERSION property corresponds to the compatibility version and VERSION corresponds to the current version - # https://cmake.org/cmake/help/latest/prop_tgt/SOVERSION.html#mach-o-versions + cmake_minimum_required(VERSION 3.17) set_target_properties(SDL2_net PROPERTIES - SOVERSION "${DYLIB_COMPATIBILITY_VERSION}" - VERSION "${DYLIB_CURRENT_VERSION}" - ) - else() - set_target_properties(SDL2_net PROPERTIES - SOVERSION "${LT_MAJOR}" - VERSION "${LT_VERSION}" + MACHO_COMPATIBILITY_VERSION "${DYLIB_COMPATIBILITY_VERSION}" + MACHO_CURRENT_VERSION "${DYLIB_CURRENT_VERSION}" ) endif() endif()