Browse Source

package: use MAGNUM_-prefixed CMake options.

pull/16/head
Vladimír Vondruš 4 years ago
parent
commit
704c904d6a
  1. 4
      package/archlinux/PKGBUILD
  2. 4
      package/archlinux/PKGBUILD-coverage
  3. 2
      package/archlinux/magnum-bindings-git/PKGBUILD
  4. 4
      package/ci/appveyor-desktop-gles.bat
  5. 4
      package/ci/appveyor-desktop.bat
  6. 4
      package/ci/unix-desktop-gles.sh
  7. 4
      package/ci/unix-desktop.sh
  8. 6
      package/homebrew/magnum-bindings.rb

4
package/archlinux/PKGBUILD

@ -23,8 +23,8 @@ build() {
cmake .. \ cmake .. \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_PYTHON=ON \ -DMAGNUM_WITH_PYTHON=ON \
-DBUILD_TESTS=ON \ -DMAGNUM_BUILD_TESTS=ON \
-G Ninja -G Ninja
ninja ninja
} }

4
package/archlinux/PKGBUILD-coverage

@ -24,8 +24,8 @@ build() {
-DCMAKE_CXX_FLAGS="--coverage" \ -DCMAKE_CXX_FLAGS="--coverage" \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_PYTHON=ON \ -DMAGNUM_WITH_PYTHON=ON \
-DBUILD_TESTS=ON \ -DMAGNUM_BUILD_TESTS=ON \
-G Ninja -G Ninja
ninja ninja
} }

2
package/archlinux/magnum-bindings-git/PKGBUILD

@ -25,7 +25,7 @@ build() {
cmake "$srcdir/${pkgname%-git}" \ cmake "$srcdir/${pkgname%-git}" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DWITH_PYTHON=ON \ -DMAGNUM_WITH_PYTHON=ON \
-G Ninja -G Ninja
ninja ninja
} }

4
package/ci/appveyor-desktop-gles.bat

@ -92,8 +92,8 @@ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.6 ^
-DWITH_PYTHON=ON ^ -DMAGNUM_WITH_PYTHON=ON ^
-DBUILD_TESTS=ON ^ -DMAGNUM_BUILD_TESTS=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b

4
package/ci/appveyor-desktop.bat

@ -100,8 +100,8 @@ cmake .. ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
-DPYBIND11_PYTHON_VERSION=3.6 ^ -DPYBIND11_PYTHON_VERSION=3.6 ^
-DWITH_PYTHON=ON ^ -DMAGNUM_WITH_PYTHON=ON ^
-DBUILD_TESTS=ON ^ -DMAGNUM_BUILD_TESTS=ON ^
%COMPILER_EXTRA% -G Ninja || exit /b %COMPILER_EXTRA% -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b

4
package/ci/unix-desktop-gles.sh

@ -80,8 +80,8 @@ cmake .. \
-DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \ -DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \
-DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \
-DPYBIND11_PYTHON_VERSION=3.6 \ -DPYBIND11_PYTHON_VERSION=3.6 \
-DWITH_PYTHON=ON \ -DMAGNUM_WITH_PYTHON=ON \
-DBUILD_TESTS=ON \ -DMAGNUM_BUILD_TESTS=ON \
-G Ninja -G Ninja
ninja $NINJA_JOBS ninja $NINJA_JOBS

4
package/ci/unix-desktop.sh

@ -83,8 +83,8 @@ cmake .. \
-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_PREFIX_PATH=$HOME/pybind11 \ -DCMAKE_PREFIX_PATH=$HOME/pybind11 \
-DPYBIND11_PYTHON_VERSION=3.6 \ -DPYBIND11_PYTHON_VERSION=3.6 \
-DWITH_PYTHON=ON \ -DMAGNUM_WITH_PYTHON=ON \
-DBUILD_TESTS=ON \ -DMAGNUM_BUILD_TESTS=ON \
-G Ninja -G Ninja
ninja $NINJA_JOBS ninja $NINJA_JOBS

6
package/homebrew/magnum-bindings.rb

@ -21,6 +21,10 @@ class MagnumBindings < Formula
end end
def install 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" system "mkdir build"
cd "build" do cd "build" do
system "cmake", system "cmake",
@ -30,7 +34,7 @@ class MagnumBindings < Formula
# of /opt/homebrew/lib which is dedicated for ARM binaries. Please # of /opt/homebrew/lib which is dedicated for ARM binaries. Please
# complain to Homebrew about this insane non-obvious filesystem layout. # complain to Homebrew about this insane non-obvious filesystem layout.
"-DCMAKE_INSTALL_NAME_DIR:STRING=#{lib}", "-DCMAKE_INSTALL_NAME_DIR:STRING=#{lib}",
"-DWITH_PYTHON=ON", "-D#{option_prefix}WITH_PYTHON=ON",
".." ".."
system "cmake", "--build", "." system "cmake", "--build", "."
system "cmake", "--build", ".", "--target", "install" system "cmake", "--build", ".", "--target", "install"

Loading…
Cancel
Save