Mercurial > mxe-octave

changeset 6109:b319dc565a3a

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)
author John Donoghue <john.donoghue@ieee.org>
date Wed, 02 Mar 2022 11:42:27 -0500
parents 27a52c235a35
children 696446c9c4f4
files src/cmake.mk
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/cmake.mk	Sun Feb 27 12:38:47 2022 +0100
+++ b/src/cmake.mk	Wed Mar 02 11:42:27 2022 -0500
@@ -8,7 +8,7 @@
 $(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)_DEPS     :=
+$(PKG)_DEPS     := bzip2 curl expat xz zlib
 
 $(PKG)_CMAKE_OPTS :=
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
@@ -17,7 +17,10 @@
   endif
 else
   ifeq ($(MXE_SYSTEM),mingw)
-    $(PKG)_CMAKE_OPTS += -DKWSYS_LFS_WORKS=TRUE
+    $(PKG)_CMAKE_OPTS += -DKWSYS_LFS_WORKS=TRUE \
+        -DCMAKE_USE_SYSTEM_CURL=ON \
+        -DZLIB_WINAPI_EXITCODE=0 \
+        -DZLIB_WINAPI_EXITCODE__TRYRUN_OUTPUT=''
   endif
 endif