From bdac579cc4a02f9707ee4658cee2f49d1ef069fd Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sun, 8 Nov 2020 12:46:43 +0000 Subject: [PATCH] tidy: updated cmake syntax --- tidy/.signature | 4 ++-- tidy/Pkgfile | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tidy/.signature b/tidy/.signature index 41fea9461..f9d2ff2a4 100644 --- a/tidy/.signature +++ b/tidy/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xA7I21UTRdrpepyDbYgupRD5LhG1GiSoL6/WBVRsSAd1kdyK3wzqhoBbUEwP5F9jPT4Yg/saXD1YNjyJlojegs= -SHA256 (Pkgfile) = 829c0800c3a8c5d8f1c2c4496bbdcc979475bb6c7fbee58bc7f83eaed3686465 +RWSagIOpLGJF3/SoaX4avkhlxm+70AxaBF5ztJnXuonIHGu2T37PxRiqXtOM2HKCHNATqaJVgIAjjCx+B6Q7kmsZsvZBpBYOPQE= +SHA256 (Pkgfile) = d3067659b1039b7f41ab9043350812e826048877dcd3de964192f3619977d26b SHA256 (.footprint) = 4fd164f764385da9f0b35ae3bee909a2c63fcd35bf58e9c3e7326a589e2ef562 SHA256 (tidy-d1b906991a7587688d384b648c55731f9be52506.tar.gz) = fa440efd18a455663d6d7f01e3a564cc2d270427a216c7fc16466b6b6de7dcb0 diff --git a/tidy/Pkgfile b/tidy/Pkgfile index f81adb684..264ea834e 100644 --- a/tidy/Pkgfile +++ b/tidy/Pkgfile @@ -10,12 +10,12 @@ release=1 source=(https://github.com/htacg/tidy-html5/archive/$commit.tar.gz#/$name-$commit.tar.gz) build() { - [[ -e /usr/bin/ninja ]] && PKGMK_TIDY_OPTIONS=' -GNinja' - cmake -Stidy-html5-$commit -Bbuild $PKGMK_TIDY_OPTIONS \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -DNDEBUG" \ - -DCMAKE_C_FLAGS_RELEASE="$CFLAGS -DNDEBUG" \ + [[ -e /usr/bin/ninja ]] && PKGMK_TIDY+=' -G Ninja' + cmake -S tidy-html5-$commit -B build $PKGMK_TIDY \ + -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 build