diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-11-30 13:19:33 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-11-30 13:19:33 (GMT) |
| commit | 65edf78d1d306ecb6fc8729a0980c272354f9383 (patch) | |
| tree | b70549a1ac6ea2c315a1629f3adea8429e0dd4ce /src | |
| parent | acf43d88efd39862d90b014ef4eaf6687baadd7b (diff) | |
| parent | 9bd2349eebe5489a4712bb0678cdf4eb4a42f276 (diff) | |
| download | mxe-65edf78d1d306ecb6fc8729a0980c272354f9383.zip mxe-65edf78d1d306ecb6fc8729a0980c272354f9383.tar.gz mxe-65edf78d1d306ecb6fc8729a0980c272354f9383.tar.bz2 | |
Merge pull request #1014 from tonytheodore/cmake
Build native version of cmake
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmake.mk | 1 | ||||
| -rw-r--r-- | src/mxe-conf.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cmake.mk b/src/cmake.mk index 11c44ef..f99868e 100644 --- a/src/cmake.mk +++ b/src/cmake.mk @@ -8,6 +8,7 @@ $(PKG)_CHECKSUM := 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a247778056 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := define $(PKG)_UPDATE diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 9adc685..082c0ad 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -53,10 +53,10 @@ define $(PKG)_BUILD echo 'if [[ "$$NO_MXE_TOOLCHAIN" == "1" ]]; then'; \ echo ' echo "== Skip using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \ echo ' # see https://github.com/mxe/mxe/issues/932'; \ - echo ' exec cmake "$$@"'; \ + echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" "$$@"'; \ echo 'else'; \ echo ' echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \ - echo ' exec cmake -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \ + echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \ echo 'fi'; \ ) \ > '$(PREFIX)/bin/$(TARGET)-cmake' |