Mercurial > mxe-octave

comparison src/cmake.mk @ 6111:497afa9abf22 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/cmake.mk: force system detection of curl for cross compile (Bug #62115) (grafted from b319dc565a3a0990f2efafbc7d7f16f904595a2c)
author John Donoghue <john.donoghue@ieee.org>
date Wed, 02 Mar 2022 11:42:27 -0500
parents b448d1565091
children 696446c9c4f4
comparison
equal deleted inserted replaced
6110:9df7598d4b90 6111:497afa9abf22
6 $(PKG)_VERSION := 3.22.1 6 $(PKG)_VERSION := 3.22.1
7 $(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb 7 $(PKG)_CHECKSUM := 71861ee1c487edf05061ab5f7dc4f13a74bfbcdb
8 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) 8 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION)
9 $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz 9 $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz
10 $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) 10 $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
11 $(PKG)_DEPS := 11 $(PKG)_DEPS := bzip2 curl expat xz zlib
12 12
13 $(PKG)_CMAKE_OPTS := 13 $(PKG)_CMAKE_OPTS :=
14 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 14 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
15 ifeq ($(MXE_SYSTEM),mingw) 15 ifeq ($(MXE_SYSTEM),mingw)
16 $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles" 16 $(PKG)_CMAKE_OPTS := -G "MSYS Makefiles"
17 endif 17 endif
18 else 18 else
19 ifeq ($(MXE_SYSTEM),mingw) 19 ifeq ($(MXE_SYSTEM),mingw)
20 $(PKG)_CMAKE_OPTS += -DKWSYS_LFS_WORKS=TRUE 20 $(PKG)_CMAKE_OPTS += -DKWSYS_LFS_WORKS=TRUE \
21 -DCMAKE_USE_SYSTEM_CURL=ON \
22 -DZLIB_WINAPI_EXITCODE=0 \
23 -DZLIB_WINAPI_EXITCODE__TRYRUN_OUTPUT=''
21 endif 24 endif
22 endif 25 endif
23 26
24 define $(PKG)_UPDATE 27 define $(PKG)_UPDATE
25 $(WGET) -q -O- 'https://www.cmake.org/cmake/resources/software.html' | \ 28 $(WGET) -q -O- 'https://www.cmake.org/cmake/resources/software.html' | \