Mercurial > mxe-octave

changeset 5571:b19fb3ed330c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use cmake command line to set build shared/static options (bug #59373) * Makefile.in (CMAKE_BUILD_SHARED_OR_STATIC): New variable. (build-cmake-toolchain-file): Don't define BUILD_SHARED_LIBS or BUILD_STATIC_LIBS in the toolchain file. * armadillo.mk, cgal.mk, cmake.mk, cminpack.mk, double-conversion.mk, eigen.mk, gdcm.mk, gl2ps.mk, hdf5.mk, lapack.mk, libical.mk, libproxy.mk, of-dicom.mk, openal.mk, opencv.mk, openexr.mk, openscenegraph.mk, physfs.mk, qhull.mk, qjson.mk, rapidjson.mk, suitesparse.mk, sundials-ida.mk, taglib.mk, vigra.mk, vmime.mk, vtk.mk, wt.mk: Use $(CMAKE_BUILD_SHARED_OR_STATIC) on the cmake command line.
author John W. Eaton <jwe@octave.org>
date Fri, 30 Oct 2020 10:06:00 -0400
parents e50a3ed99da0
children 3588be46d1d9
files Makefile.in src/armadillo.mk src/cgal.mk src/cmake.mk src/cminpack.mk src/double-conversion.mk src/eigen.mk src/gdcm.mk src/gl2ps.mk src/hdf5.mk src/lapack.mk src/libical.mk src/libproxy.mk src/of-dicom.mk src/openal.mk src/opencv.mk src/openexr.mk src/openscenegraph.mk src/physfs.mk src/qhull.mk src/qjson.mk src/rapidjson.mk src/suitesparse.mk src/sundials-ida.mk src/taglib.mk src/vigra.mk src/vmime.mk src/vtk.mk src/wt.mk
diffstat 29 files changed, 40 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Wed Oct 28 17:55:35 2020 +0100
+++ b/Makefile.in	Fri Oct 30 10:06:00 2020 -0400
@@ -163,18 +163,23 @@
 ## update the HG-ID file in the build tree.
 $(shell $(TOP_DIR)/tools/mk-hg-id.sh "$(TOP_DIR)")
 
-# At least one package uses --with instead of --enable.  
+## At least one package uses --with instead of --enable.
+## Some cmake packages use BUILD_STATIC_LIBS and at least
+## one uses ONLY_SHARED_LIBS
 ifeq ($(BUILD_SHARED),yes)
   ifeq ($(BUILD_STATIC),yes)
     ENABLE_SHARED_OR_STATIC := --enable-shared --enable-static
     WITH_SHARED_OR_STATIC := --with-shared --with-static
+    CMAKE_BUILD_SHARED_OR_STATIC := -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -DONLY_SHARED_LIBS=OFF
   else
     ENABLE_SHARED_OR_STATIC := --enable-shared --disable-static
     WITH_SHARED_OR_STATIC := --with-shared --without-static
+    CMAKE_BUILD_SHARED_OR_STATIC := -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DONLY_SHARED_LIBS=ON
   endif
 else
   ENABLE_SHARED_OR_STATIC := --disable-shared --enable-static
   WITH_SHARED_OR_STATIC := --without-shared --with-static
+  CMAKE_BUILD_SHARED_OR_STATIC := -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -DONLY_SHARED_LIBS=OFF
 endif
 
 ifeq ($(ENABLE_DEP_DOCS),no)
@@ -1092,16 +1097,6 @@
      if [ $(MXE_SYSTEM) = msvc ]; then \
        echo 'set(MSVC 1)'; \
      fi; \
-     if [ $(BUILD_SHARED) = yes ]; then \
-       echo 'set(BUILD_SHARED_LIBS ON)'; \
-     else \
-       echo 'set(BUILD_SHARED_LIBS OFF)'; \
-     fi; \
-     if [ $(BUILD_STATIC) = yes ]; then \
-       echo 'set(BUILD_STATIC_LIBS ON)'; \
-     else \
-       echo 'set(BUILD_STATIC_LIBS OFF)'; \
-     fi; \
      echo 'set(CMAKE_BUILD_TYPE Release)'; \
      if [ $(MXE_SYSTEM) = msvc ]; then \
          echo 'set(CMAKE_FIND_ROOT_PATH $(HOST_PREFIX_NATIVE))'; \
--- a/src/armadillo.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/armadillo.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -20,6 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && cmake . \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1
 
--- a/src/cgal.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/cgal.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -26,6 +26,7 @@
         -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
         -DWITH_CGAL_Qt3:BOOL="0" \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DBOOST_COMPILER=_win32 \
         -DBOOST_THREAD_USE_LIB=1 \
@@ -38,6 +39,7 @@
         -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
         -DWITH_CGAL_Qt3:BOOL="0" \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DBOOST_COMPILER=_win32 \
         -DBOOST_THREAD_USE_LIB=1 \
--- a/src/cmake.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/cmake.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -33,6 +33,7 @@
     cd '$(1).build' && cmake \
         $($(PKG)_CMAKE_OPTS) \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         ../$($(PKG)_SUBDIR)
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
--- a/src/cminpack.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/cminpack.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -19,6 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && cmake \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'
     $(MAKE) -C '$(1)' -j $(JOBS)
 
--- a/src/double-conversion.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/double-conversion.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -23,6 +23,7 @@
         $($(PKG)_CMAKE_FLAGS) \
         -DBUILD_TESTING=no \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         .
 
--- a/src/eigen.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/eigen.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -22,6 +22,7 @@
     cd '$(1).build' && \
     cmake \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         '$(1)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)' DESTDIR='$(3)' install
--- a/src/gdcm.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/gdcm.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -30,6 +30,7 @@
         cd '$(1)/../.build' && cmake \
             -G "NMake Makefiles" \
             $(CMAKE_CCACHE_FLAGS) \
+            $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'  \
             -DGDCM_BUILD_SHARED_LIBS:BOOL=TRUE \
             -DGDCM_USE_SYSTEM_ZLIB:BOOL=TRUE \
@@ -49,6 +50,7 @@
         cd '$(1)/../.build' && cmake \
             $($(PKG)_CMAKE_OPTS) \
             $(CMAKE_CCACHE_FLAGS) \
+            $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'  \
             -DGDCM_BUILD_SHARED_LIBS:BOOL=TRUE \
             -DGDCM_BUILD_TESTING:BOOL=FALSE \
--- a/src/gl2ps.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/gl2ps.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -29,6 +29,7 @@
         cd '$(1)' && cmake \
             $($(PKG)_CMAKE_FLAGS) \
             $(CMAKE_CCACHE_FLAGS) \
+            $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
             -DPNG_NAMES=png16 \
             .
@@ -55,6 +56,7 @@
             cd '$(1)' && cmake \
                 $($(PKG)_CMAKE_FLAGS) \
                 $(CMAKE_CCACHE_FLAGS) \
+                $(CMAKE_BUILD_SHARED_OR_STATIC) \
                 -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
                 .
             $(MAKE) -C '$(1)' -j '$(JOBS)' VERBOSE=1 
--- a/src/hdf5.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/hdf5.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -62,8 +62,8 @@
     cd '$(1)/.build' && cmake .. -G "Unix Makefiles" \
         -DCMAKE_INSTALL_PREFIX=${prefix} \
         $($(PKG)_CMAKE_FLAGS) \
-        -DBUILD_SHARED_LIBS=$(if $(findstring yes,$(BUILD_SHARED)),ON,OFF) \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DHDF5_INSTALL_BIN_DIR='$(HOST_BINDIR)' \
         -DHDF5_INSTALL_LIB_DIR='$(HOST_LIBDIR)' \
--- a/src/lapack.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/lapack.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -62,6 +62,7 @@
         mkdir '$(1)/build'
         cd '$(1)/build' && cmake \
             $(CMAKE_CCACHE_FLAGS) \
+            $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
             -DCMAKE_AR='$(MXE_AR)' \
             -DCMAKE_RANLIB='$(MXE_RANLIB)' \
--- a/src/libical.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/libical.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -19,6 +19,7 @@
     cd '$(1)' && mkdir build
     cd '$(1)/build' && cmake .. \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DSTATIC_LIBRARY=true \
         -DHAVE_PTHREAD_H=false \
--- a/src/libproxy.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/libproxy.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -24,6 +24,7 @@
         -DWITH_KDE=no \
         -DBUILD_TESTING=no \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         .
 
--- a/src/of-dicom.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/of-dicom.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -16,7 +16,7 @@
 endif
 
 ifeq ($(MXE_NATIVE_BUILD),no)
-    $(PKG)_OPTIONS := CMAKE_BINARY="cmake $(CMAKE_CCACHE_FLAGS) -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'"
+    $(PKG)_OPTIONS := CMAKE_BINARY="cmake $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC) -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'"
 else
     $(PKG)_OPTIONS := 
 endif
--- a/src/openal.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/openal.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -19,6 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)/build' && cmake .. \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DEXAMPLES=FALSE
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
--- a/src/opencv.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/opencv.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -24,6 +24,7 @@
     mkdir '$(1)/build'
     cd '$(1)/build' && cmake ..  \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         --debug-output \
         -DBUILD_opencv_dnn=OFF \
--- a/src/openexr.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/openexr.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -21,6 +21,7 @@
         mkdir '$(1)/build'
         cd '$(1)/build' && cmake ..  \
             $(CMAKE_CCACHE_FLAGS) \
+            $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
             -DBUILD_TESTING='OFF' \
             -DINSTALL_OPENEXR_DOCS='OFF' \
@@ -37,6 +38,7 @@
         mkdir '$(1)/build'
         cd '$(1)/build' && cmake ..  \
             $(CMAKE_CCACHE_FLAGS) \
+            $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
             -DBUILD_TESTING='OFF' \
             -DCMAKE_VERBOSE_MAKEFILE='ON' \
--- a/src/openscenegraph.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/openscenegraph.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -27,6 +27,7 @@
     mkdir -p '$(1)/.build'
     cd '$(1)/.build' && cmake .. \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS \
         -DCMAKE_HAVE_PTHREAD_H=ON \
--- a/src/physfs.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/physfs.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -19,6 +19,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && cmake . \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DPHYSFS_BUILD_SHARED=FALSE \
         -DPHYSFS_INTERNAL_ZLIB=FALSE \
--- a/src/qhull.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/qhull.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -28,6 +28,7 @@
     cd '$(1)/../.build' && cmake \
         $($(PKG)_CMAKE_OPTS) \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DDOC_INSTALL_DIR='$(1)' \
         ../$($(PKG)_SUBDIR)
--- a/src/qjson.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/qjson.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -21,6 +21,7 @@
     mkdir '$(1)/build'
     cd '$(1)/build' && cmake .. \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DLIBTYPE=STATIC
 
--- a/src/rapidjson.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/rapidjson.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -21,6 +21,7 @@
     cd '$(1).build' && \
     cmake \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DRAPIDJSON_BUILD_DOC=Off \
         -DRAPIDJSON_BUILD_EXAMPLES=Off \
--- a/src/suitesparse.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/suitesparse.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -58,7 +58,7 @@
     BLAS="-lblas -lgfortran" \
     LAPACK='-llapack' \
     CHOLMOD_CONFIG='-DNPARTITION' \
-    CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $(CMAKE_CCACHE_FLAGS)'
+    CMAKE_OPTIONS='-DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC)'
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
     $(PKG)_MAKE_OPTS += \
@@ -82,6 +82,7 @@
     cd $(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR) && \
         cmake $(1)/metis-5.1.0 \
             $(CMAKE_CCACHE_FLAGS) \
+            $(CMAKE_BUILD_SHARED_OR_STATIC) \
             -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
             $($(PKG)_METIS_CONFIG_FLAGS)
     $(MAKE) -C '$(1)/metis-5.1.0/$($(PKG)_METIS_BUILDDIR)' metis -j '$(JOBS)'
--- a/src/sundials-ida.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/sundials-ida.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -35,6 +35,7 @@
     mkdir '$(1).build'
     cd '$(1).build' && cmake \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DBUILD_ARKODE=OFF \
         -DBUILD_CVODE=OFF \
--- a/src/taglib.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/taglib.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -21,6 +21,7 @@
     mkdir '$(1)/build'
     cd '$(1)/build' && cmake .. \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DENABLE_STATIC=ON
     $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
--- a/src/vigra.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/vigra.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -24,6 +24,7 @@
     mkdir '$(1)/build'
     cd '$(1)/build' && cmake .. \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DLIBTYPE=STATIC \
         -DVIGRA_STATIC_LIB=1 \
--- a/src/vmime.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/vmime.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -20,6 +20,7 @@
 define $(PKG)_BUILD
     cd '$(1)' && cmake \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         -DCMAKE_AR='$(MXE_AR)' \
         -DCMAKE_RANLIB='$(MXE_RANLIB)' \
--- a/src/vtk.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/vtk.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -23,6 +23,7 @@
     mkdir '$(1)/native_build'
     cd '$(1)/native_build' && cmake \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' \
         -DBUILD_TESTING=FALSE \
         -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \
@@ -40,6 +41,7 @@
     cd '$(1)/cross_build' && cmake \
         -C '$(1)/TryRunResults.cmake'\
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'\
         -DBUILD_TESTING=FALSE\
         -DVTKCompileTools_DIR='$(1)/native_build'\
--- a/src/wt.mk	Wed Oct 28 17:55:35 2020 +0100
+++ b/src/wt.mk	Fri Oct 30 10:06:00 2020 -0400
@@ -35,6 +35,7 @@
         -DPANGO_FT2_LIBS="`'$(MXE_PKG_CONFIG)' --libs-only-l pangoft2`" \
         -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \
         $(CMAKE_CCACHE_FLAGS) \
+        $(CMAKE_BUILD_SHARED_OR_STATIC) \
         -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
         '$(1)'