diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index cc96b5b..fb00f32 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -23,8 +23,8 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_PYTHON=ON \ - -DBUILD_TESTS=ON \ + -DMAGNUM_WITH_PYTHON=ON \ + -DMAGNUM_BUILD_TESTS=ON \ -G Ninja ninja } diff --git a/package/archlinux/PKGBUILD-coverage b/package/archlinux/PKGBUILD-coverage index 32cbbf0..d959cba 100644 --- a/package/archlinux/PKGBUILD-coverage +++ b/package/archlinux/PKGBUILD-coverage @@ -24,8 +24,8 @@ build() { -DCMAKE_CXX_FLAGS="--coverage" \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_PYTHON=ON \ - -DBUILD_TESTS=ON \ + -DMAGNUM_WITH_PYTHON=ON \ + -DMAGNUM_BUILD_TESTS=ON \ -G Ninja ninja } diff --git a/package/archlinux/magnum-bindings-git/PKGBUILD b/package/archlinux/magnum-bindings-git/PKGBUILD index a5338a9..4a6a0d2 100644 --- a/package/archlinux/magnum-bindings-git/PKGBUILD +++ b/package/archlinux/magnum-bindings-git/PKGBUILD @@ -25,7 +25,7 @@ build() { cmake "$srcdir/${pkgname%-git}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_PYTHON=ON \ + -DMAGNUM_WITH_PYTHON=ON \ -G Ninja ninja } diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 6cec308..efc8c17 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -92,8 +92,8 @@ cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DPYBIND11_PYTHON_VERSION=3.6 ^ - -DWITH_PYTHON=ON ^ - -DBUILD_TESTS=ON ^ + -DMAGNUM_WITH_PYTHON=ON ^ + -DMAGNUM_BUILD_TESTS=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index a7677de..e024cea 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -100,8 +100,8 @@ cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^ -DPYBIND11_PYTHON_VERSION=3.6 ^ - -DWITH_PYTHON=ON ^ - -DBUILD_TESTS=ON ^ + -DMAGNUM_WITH_PYTHON=ON ^ + -DMAGNUM_BUILD_TESTS=ON ^ %COMPILER_EXTRA% -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 8b6856d..bff7269 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -80,8 +80,8 @@ cmake .. \ -DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \ -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ -DPYBIND11_PYTHON_VERSION=3.6 \ - -DWITH_PYTHON=ON \ - -DBUILD_TESTS=ON \ + -DMAGNUM_WITH_PYTHON=ON \ + -DMAGNUM_BUILD_TESTS=ON \ -G Ninja ninja $NINJA_JOBS diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index c051f66..795fc52 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -83,8 +83,8 @@ cmake .. \ -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_PREFIX_PATH=$HOME/pybind11 \ -DPYBIND11_PYTHON_VERSION=3.6 \ - -DWITH_PYTHON=ON \ - -DBUILD_TESTS=ON \ + -DMAGNUM_WITH_PYTHON=ON \ + -DMAGNUM_BUILD_TESTS=ON \ -G Ninja ninja $NINJA_JOBS diff --git a/package/homebrew/magnum-bindings.rb b/package/homebrew/magnum-bindings.rb index 017520c..634fa4a 100644 --- a/package/homebrew/magnum-bindings.rb +++ b/package/homebrew/magnum-bindings.rb @@ -21,6 +21,10 @@ class MagnumBindings < Formula end def install + # 2020.06 has the options unprefixed, current master has them prefixed. + # Options not present in 2020.06 are prefixed always. + option_prefix = build.head? ? 'MAGNUM_' : '' + system "mkdir build" cd "build" do system "cmake", @@ -30,7 +34,7 @@ class MagnumBindings < Formula # of /opt/homebrew/lib which is dedicated for ARM binaries. Please # complain to Homebrew about this insane non-obvious filesystem layout. "-DCMAKE_INSTALL_NAME_DIR:STRING=#{lib}", - "-DWITH_PYTHON=ON", + "-D#{option_prefix}WITH_PYTHON=ON", ".." system "cmake", "--build", "." system "cmake", "--build", ".", "--target", "install"