Mercurial > mxe-octave
changeset 6041:add53481eef1
* src/gdcm.mk: Build with ninja.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 08 Jan 2022 13:49:20 +0100 |
parents | 1aacdfe412b2 |
children | eb62db3251f3 |
files | src/gdcm.mk |
diffstat | 1 files changed, 4 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gdcm.mk Thu Jan 06 12:38:25 2022 -0500 +++ b/src/gdcm.mk Sat Jan 08 13:49:20 2022 +0100 @@ -8,14 +8,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG) 3.x/GDCM $($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := expat zlib - -$(PKG)_CMAKE_OPTS := -ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - ifeq ($(MXE_SYSTEM),mingw) - $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" - endif -endif +$(PKG)_DEPS := expat zlib build-ninja define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/gdcm/files/gdcm 3.x/' | \ @@ -48,7 +41,7 @@ define $(PKG)_BUILD mkdir '$(1)/../.build' cd '$(1)/../.build' && cmake \ - $($(PKG)_CMAKE_OPTS) \ + -GNinja \ $(CMAKE_CCACHE_FLAGS) \ $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ @@ -58,8 +51,8 @@ -DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=FALSE \ ../$($(PKG)_SUBDIR) - make -C $(1)/../.build -j $(JOBS) - make -C $(1)/../.build -j 1 install DESTDIR=$(3) + cmake --build $(1)/../.build -j $(JOBS) + DESTDIR=$(3) cmake --install $(1)/../.build endef endif