diff options
author | Tim Biermann <tbier@posteo.de> | 2020-11-08 12:11:28 +0000 |
---|---|---|
committer | Tim Biermann <tbier@posteo.de> | 2020-11-08 13:41:14 +0000 |
commit | 8703fb3cc57e014fe5a74b545b123593d76a9cef (patch) | |
tree | 6444d6244ccfdcae79a365d96dae2407d360912a /openjpeg2 | |
parent | 4f594eaa6ba90641ff5eb3d8d5f16fdaff2fd073 (diff) | |
download | contrib-8703fb3cc57e014fe5a74b545b123593d76a9cef.tar.gz contrib-8703fb3cc57e014fe5a74b545b123593d76a9cef.tar.xz |
openjpeg2: updated cmake syntax
Diffstat (limited to 'openjpeg2')
-rw-r--r-- | openjpeg2/.signature | 4 | ||||
-rw-r--r-- | openjpeg2/Pkgfile | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/openjpeg2/.signature b/openjpeg2/.signature index ff4b50f38..63e6082a3 100644 --- a/openjpeg2/.signature +++ b/openjpeg2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wKMJJtkkPh1fLwse0RseTtF9aMsRn4brRUlNVLOrDKBLAS95gc8FHCQtErIW8Kr6BIuKtIjHTF/TduqGRuSRwI= -SHA256 (Pkgfile) = 35348315a831afcd8c9b4e7b78a0ce366fb11ef95e5bfc0a86ba5367fea93835 +RWSagIOpLGJF3wqoOuRNo1ygltWeQpmZpBRpuiYX5u/UsgJt7tbCiVJXy3qyAwui4y46xlASrH6JbfRJmjLawQSVfvopjKHHCQk= +SHA256 (Pkgfile) = d8cd93c56d9fd5436df1fa17acb7f1aabb60c670a0bfa92170cc5e8acd653487 SHA256 (.footprint) = 765d8e0bf55e17997af756206951427620277fd1f6bb5ea17f5a0b1b18a3f8b5 SHA256 (openjpeg-2.3.1.tar.gz) = 63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 diff --git a/openjpeg2/Pkgfile b/openjpeg2/Pkgfile index b2c87d4e2..6a1d14c4e 100644 --- a/openjpeg2/Pkgfile +++ b/openjpeg2/Pkgfile @@ -9,12 +9,13 @@ release=1 source=(https://github.com/uclouvain/openjpeg/archive/v$version/openjpeg-$version.tar.gz) build() { - [[ -e /usr/bin/ninja ]] && PKGMK_OJPG2_OPTIONS=' -GNinja' - cmake -Sopenjpeg-$version -Bbuild $PKGMK_OJPG2_OPTIONS \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ - -DCMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ + # cmake --build/install fails, so don't offer ninja right now + #[[ -e /usr/bin/ninja ]] && PKGMK_OJPG2+=' -G Ninja' + cmake -S openjpeg-$version -B build $PKGMK_OJPG2 \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ -Wno-dev # cmake --build/install fails |