diff options
| author | Tony Theodore <tonyt@logyst.com> | 2016-07-07 02:45:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 02:45:38 (GMT) |
| commit | e96947b7a001981f60a5163cd8ab9da52ed1ac00 (patch) | |
| tree | ace257eb894e71fa003cab2547ca040222866b3e /src | |
| parent | 1701daf5174036ca9fe2a0892bb9632be4c091f7 (diff) | |
| parent | 0c7d75309e775f3c7d3e4634ec0727484ddcf441 (diff) | |
| download | mxe-e96947b7a001981f60a5163cd8ab9da52ed1ac00.zip mxe-e96947b7a001981f60a5163cd8ab9da52ed1ac00.tar.gz mxe-e96947b7a001981f60a5163cd8ab9da52ed1ac00.tar.bz2 | |
Merge pull request #1427 from tehnick/update-oce
oce: update from 0.16.1 to 0.17.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/oce.mk | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -3,8 +3,8 @@ PKG := oce $(PKG)_IGNORE := -$(PKG)_VERSION := 0.16.1 -$(PKG)_CHECKSUM := d31030c8da4a1b33f767d0d59895a995c8eabc8fc65cbe0558734f6021ea2f57 +$(PKG)_VERSION := 0.17.2 +$(PKG)_CHECKSUM := 8d9995360cd531cbd4a7aa4ca5ed969f08ec7c7a37755e2f3d4ef832c1b2f56e $(PKG)_SUBDIR := $(PKG)-OCE-$($(PKG)_VERSION) $(PKG)_FILE := OCE-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/tpaviot/oce/archive/$($(PKG)_FILE) @@ -18,15 +18,16 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + mkdir '$(1).build' + cd '$(1).build' && $(TARGET)-cmake '$(1)' \ -DOCE_BUILD_SHARED_LIB=$(if $(BUILD_STATIC),FALSE,TRUE) \ -DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \ -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE - $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 + $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1).build' -j 1 install cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)/examples/find_package_oce' |