diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -168,13 +168,16 @@ 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 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 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 endif ifeq ($(ENABLE_DEP_DOCS),no) @@ -1092,16 +1095,6 @@ define build-cmake-toolchain-file 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))'; \ diff --git a/src/armadillo.mk b/src/armadillo.mk --- a/src/armadillo.mk +++ b/src/armadillo.mk @@ -20,6 +20,7 @@ endef 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 diff --git a/src/cgal.mk b/src/cgal.mk --- a/src/cgal.mk +++ b/src/cgal.mk @@ -26,6 +26,7 @@ define $(PKG)_BUILD -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 @@ define $(PKG)_BUILD -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 \ diff --git a/src/cmake.mk b/src/cmake.mk --- a/src/cmake.mk +++ b/src/cmake.mk @@ -33,6 +33,7 @@ define $(PKG)_BUILD 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)' diff --git a/src/cminpack.mk b/src/cminpack.mk --- a/src/cminpack.mk +++ b/src/cminpack.mk @@ -19,6 +19,7 @@ endef 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) diff --git a/src/double-conversion.mk b/src/double-conversion.mk --- a/src/double-conversion.mk +++ b/src/double-conversion.mk @@ -23,6 +23,7 @@ define $(PKG)_BUILD $($(PKG)_CMAKE_FLAGS) \ -DBUILD_TESTING=no \ $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ . diff --git a/src/eigen.mk b/src/eigen.mk --- a/src/eigen.mk +++ b/src/eigen.mk @@ -22,6 +22,7 @@ define $(PKG)_BUILD 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 diff --git a/src/gdcm.mk b/src/gdcm.mk --- a/src/gdcm.mk +++ b/src/gdcm.mk @@ -30,6 +30,7 @@ ifeq ($(MXE_SYSTEM),msvc) 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 @@ else 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 \ diff --git a/src/gl2ps.mk b/src/gl2ps.mk --- a/src/gl2ps.mk +++ b/src/gl2ps.mk @@ -29,6 +29,7 @@ ifeq ($(MXE_SYSTEM),msvc) 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 @@ else 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 diff --git a/src/hdf5.mk b/src/hdf5.mk --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -62,8 +62,8 @@ define $(PKG)_BUILD 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)' \ @@ -78,16 +78,16 @@ define $(PKG)_BUILD $($(PKG)_CROSS_CONFIG_OPTIONS) \ -DHDF5_USE_PREGEN_DIR='$(1)/pregen' - $(MAKE) -C '$(1)/.build' -j '$(JOBS)' + $(MAKE) -C '$(1)/.build' -j '$(JOBS)' $(MAKE) -C '$(1)/.build' -j 1 install DESTDIR='$(3)' # FIXME: Change the build rule to create the shared libs with the prefix if test x$(MXE_SYSTEM) = xmingw; then \ - mv '$(3)/$(HOST_LIBDIR)/hdf5.lib' '$(3)/$(HOST_LIBDIR)/libhdf5.lib'; \ - mv '$(3)/$(HOST_LIBDIR)/hdf5_tools.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_tools.lib'; \ - mv '$(3)/$(HOST_LIBDIR)/hdf5_hl.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_hl.lib'; \ + mv '$(3)/$(HOST_LIBDIR)/hdf5.lib' '$(3)/$(HOST_LIBDIR)/libhdf5.dll.a'; \ + mv '$(3)/$(HOST_LIBDIR)/hdf5_tools.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_tools.dll.a'; \ + mv '$(3)/$(HOST_LIBDIR)/hdf5_hl.lib' '$(3)/$(HOST_LIBDIR)/libhdf5_hl.dll.a'; \ fi - + # Remove version suffix from pkg-config files mv '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5-$($(PKG)_VERSION).pc' '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5.pc' mv '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5_hl-$($(PKG)_VERSION).pc' '$(3)/$(HOST_LIBDIR)/pkgconfig/hdf5_hl.pc' diff --git a/src/lapack.mk b/src/lapack.mk --- a/src/lapack.mk +++ b/src/lapack.mk @@ -62,6 +62,7 @@ else 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)' \ diff --git a/src/libical.mk b/src/libical.mk --- a/src/libical.mk +++ b/src/libical.mk @@ -19,6 +19,7 @@ define $(PKG)_BUILD 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 \ diff --git a/src/libproxy.mk b/src/libproxy.mk --- a/src/libproxy.mk +++ b/src/libproxy.mk @@ -24,6 +24,7 @@ define $(PKG)_BUILD -DWITH_KDE=no \ -DBUILD_TESTING=no \ $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ . diff --git a/src/llvm.mk b/src/llvm.mk --- a/src/llvm.mk +++ b/src/llvm.mk @@ -23,6 +23,7 @@ ifeq ($(MXE_NATIVE_BUILD),yes) mkdir '$(1)/.build' && cd '$(1)/.build' && cmake .. \ $($(PKG)_CMAKE_FLAGS) \ $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLLVM_BUILD_LLVM_DYLIB=On \ -DLLVM_LINK_LLVM_DYLIB=On \ @@ -67,13 +68,14 @@ else cd '$(1)/.build' && 'cmake' .. \ $($(PKG)_CMAKE_FLAGS) \ $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLLVM_BUILD_TOOLS=OFF \ -DLLVM_BUILD_LLVM_DYLIB=On \ -DLLVM_LINK_LLVM_DYLIB=On \ -DLLVM_VERSION_SUFFIX= \ $($(PKG)_SYSDEP_CMAKE_OPTIONS) \ - -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)'" \ + -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_NATIVE_TOOLCHAIN_FILE)' $(CMAKE_CCACHE_FLAGS) $(CMAKE_BUILD_SHARED_OR_STATIC)" \ -DLLVM_BUILD_EXAMPLES=Off \ -DLLVM_INCLUDE_EXAMPLES=Off \ -DLLVM_BUILD_TESTS=Off \ diff --git a/src/of-dicom.mk b/src/of-dicom.mk --- a/src/of-dicom.mk +++ b/src/of-dicom.mk @@ -16,7 +16,7 @@ ifeq ($(ENABLE_BINARY_PACKAGES),yes) 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 diff --git a/src/openal.mk b/src/openal.mk --- a/src/openal.mk +++ b/src/openal.mk @@ -19,6 +19,7 @@ endef 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 diff --git a/src/opencv.mk b/src/opencv.mk --- a/src/opencv.mk +++ b/src/opencv.mk @@ -24,6 +24,7 @@ define $(PKG)_BUILD 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 \ diff --git a/src/openexr.mk b/src/openexr.mk --- a/src/openexr.mk +++ b/src/openexr.mk @@ -21,6 +21,7 @@ ifeq ($(MXE_NATIVE_BUILD),yes) 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 @@ else 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' \ diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -27,6 +27,7 @@ define $(PKG)_BUILD 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 \ diff --git a/src/physfs.mk b/src/physfs.mk --- a/src/physfs.mk +++ b/src/physfs.mk @@ -19,6 +19,7 @@ endef 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 \ diff --git a/src/qhull.mk b/src/qhull.mk --- a/src/qhull.mk +++ b/src/qhull.mk @@ -28,6 +28,7 @@ define $(PKG)_BUILD 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) diff --git a/src/qjson.mk b/src/qjson.mk --- a/src/qjson.mk +++ b/src/qjson.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ $(CMAKE_CCACHE_FLAGS) \ + $(CMAKE_BUILD_SHARED_OR_STATIC) \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLIBTYPE=STATIC diff --git a/src/rapidjson.mk b/src/rapidjson.mk --- a/src/rapidjson.mk +++ b/src/rapidjson.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD 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 \ diff --git a/src/suitesparse.mk b/src/suitesparse.mk --- a/src/suitesparse.mk +++ b/src/suitesparse.mk @@ -58,7 +58,7 @@ endif 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 @@ define $(PKG)_BUILD 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)' diff --git a/src/sundials-ida.mk b/src/sundials-ida.mk --- a/src/sundials-ida.mk +++ b/src/sundials-ida.mk @@ -35,6 +35,7 @@ define $(PKG)_BUILD 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 \ diff --git a/src/taglib.mk b/src/taglib.mk --- a/src/taglib.mk +++ b/src/taglib.mk @@ -21,6 +21,7 @@ define $(PKG)_BUILD 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 diff --git a/src/vigra.mk b/src/vigra.mk --- a/src/vigra.mk +++ b/src/vigra.mk @@ -24,6 +24,7 @@ define $(PKG)_BUILD 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 \ diff --git a/src/vmime.mk b/src/vmime.mk --- a/src/vmime.mk +++ b/src/vmime.mk @@ -20,6 +20,7 @@ endef 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)' \ diff --git a/src/vtk.mk b/src/vtk.mk --- a/src/vtk.mk +++ b/src/vtk.mk @@ -23,6 +23,7 @@ define $(PKG)_BUILD 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 @@ define $(PKG)_BUILD 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'\ diff --git a/src/wt.mk b/src/wt.mk --- a/src/wt.mk +++ b/src/wt.mk @@ -35,6 +35,7 @@ define $(PKG)_BUILD -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)'