diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-10-18 23:29:33 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2017-01-08 02:01:54 (GMT) |
| commit | e2fd9fe23a4a883586dbe4596352784a16cb1c5d (patch) | |
| tree | a1ecd72bf6b042b281d65a1a61c6ec3125e2feca /src | |
| parent | 0555e10e6f85e6066b6b210a23843967c8d4b394 (diff) | |
| download | mxe-e2fd9fe23a4a883586dbe4596352784a16cb1c5d.zip mxe-e2fd9fe23a4a883586dbe4596352784a16cb1c5d.tar.gz mxe-e2fd9fe23a4a883586dbe4596352784a16cb1c5d.tar.bz2 | |
use cmake wrapper in all packages
Native binaries (libmysqlclient, vtk, vtk6) still build with `cmake`
instead of the cmake wrapper. Note that even in these cases MXE's cmake
is used (not system cmake), because $(PREFIX)/$(BUILD)/bin is added to
PATH by Makefile and MXE's cmake binary exists there.
Diffstat (limited to 'src')
47 files changed, 53 insertions, 120 deletions
diff --git a/src/alure.mk b/src/alure.mk index b00f8da..0e82345 100644 --- a/src/alure.mk +++ b/src/alure.mk @@ -18,7 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)/build' && cmake \ + cd '$(1)/build' && '$(TARGET)-cmake' \ -DDYNLOAD=OFF \ -DBUILD_STATIC=ON \ -DBUILD_SHARED=OFF \ @@ -26,7 +26,6 @@ define $(PKG)_BUILD -DFLUIDSYNTH=OFF \ -DCMAKE_C_FLAGS="-DAL_LIBTYPE_STATIC -DALURE_STATIC_LIBRARY" \ -DCMAKE_CXX_FLAGS="-DAL_LIBTYPE_STATIC -DALURE_STATIC_LIBRARY" \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ .. $(MAKE) -C '$(1)/build' -j $(JOBS) VERBOSE=1 $(MAKE) -C '$(1)/build' -j $(JOBS) install diff --git a/src/armadillo.mk b/src/armadillo.mk index cd6ac1d..1c8a3fe 100644 --- a/src/armadillo.mk +++ b/src/armadillo.mk @@ -19,9 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_SHARED),YES,NO) \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DARMA_USE_WRAPPER=false $(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1 diff --git a/src/box2d.mk b/src/box2d.mk index 317aff5..d29c7de 100644 --- a/src/box2d.mk +++ b/src/box2d.mk @@ -18,8 +18,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1).build' && '$(TARGET)-cmake' . \ -DBOX2D_INSTALL=ON \ -DBOX2D_BUILD_EXAMPLES=OFF \ -DBOX2D_BUILD_STATIC=$(CMAKE_STATIC_BOOL) \ diff --git a/src/bullet.mk b/src/bullet.mk index 205683a..9d8402f 100644 --- a/src/bullet.mk +++ b/src/bullet.mk @@ -18,8 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)' && '$(TARGET)-cmake' . \ -DINSTALL_LIBS=ON \ -DBUILD_CPU_DEMOS=OFF \ -DBUILD_DEMOS=OFF \ diff --git a/src/chipmunk.mk b/src/chipmunk.mk index 13af91f..354fc2a 100644 --- a/src/chipmunk.mk +++ b/src/chipmunk.mk @@ -19,8 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DBUILD_DEMOS=OFF \ -DINSTALL_DEMOS=OFF \ $(if $(BUILD_STATIC), \ diff --git a/src/chromaprint.mk b/src/chromaprint.mk index 6950de9..e88365d 100644 --- a/src/chromaprint.mk +++ b/src/chromaprint.mk @@ -17,8 +17,6 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_SHARED),ON,OFF) + cd '$(1)' && '$(TARGET)-cmake' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/cminpack.mk b/src/cminpack.mk index 6095950..97709e9 100644 --- a/src/cminpack.mk +++ b/src/cminpack.mk @@ -17,8 +17,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)' && '$(TARGET)-cmake' $(MAKE) -C '$(1)' -j $(JOBS) $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk index 9a97d51..90e98f9 100644 --- a/src/cpp-netlib.mk +++ b/src/cpp-netlib.mk @@ -20,8 +20,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DINSTALL_CMAKE_DIR='$(PREFIX)/$(TARGET)/cmake/cppnetlib' \ -DCPP-NETLIB_BUILD_EXAMPLES=OFF \ -DCPP-NETLIB_BUILD_TESTS=OFF diff --git a/src/eigen.mk b/src/eigen.mk index c672e09..33a649a 100644 --- a/src/eigen.mk +++ b/src/eigen.mk @@ -18,9 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && mkdir build && cd build && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_BUILD_TYPE=Release \ + cd '$(1)' && mkdir build && cd build && '$(TARGET)-cmake' .. \ -DEIGEN_BUILD_PKGCONFIG=ON \ -Drun_res=1 -Drun_res__TRYRUN_OUTPUT="" $(MAKE) -C '$(1)'/build -j '$(JOBS)' install VERBOSE=1 diff --git a/src/flann.mk b/src/flann.mk index 63d823e..2b20fe0 100644 --- a/src/flann.mk +++ b/src/flann.mk @@ -22,9 +22,7 @@ define $(PKG)_BUILD_SHARED # workaround for strange "too many sections" error # setting CXXFLAGS='-O3' seems to fix it # similar to http://www.mail-archive.com/mingw-w64-public@lists.sourceforge.net/msg06329.html - cd '$(1)' && CXXFLAGS='-O3' cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_BUILD_TYPE=Release \ + cd '$(1)' && CXXFLAGS='-O3' '$(TARGET)-cmake' . \ -DBUILD_CUDA_LIB=OFF \ -DBUILD_MATLAB_BINDINGS=OFF \ -DBUILD_PYTHON_BINDINGS=OFF \ diff --git a/src/glfw3.mk b/src/glfw3.mk index f5cd432..89f8312 100644 --- a/src/glfw3.mk +++ b/src/glfw3.mk @@ -17,9 +17,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake '$(1)' \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ -DGLFW_BUILD_EXAMPLES=FALSE \ -DGLFW_BUILD_TESTS=FALSE \ -DGLFW_BUILD_DOCS=FALSE \ diff --git a/src/json_spirit.mk b/src/json_spirit.mk index 923701e..2eb57a1 100644 --- a/src/json_spirit.mk +++ b/src/json_spirit.mk @@ -29,9 +29,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && \ - cmake '$(1)' \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_BUILD_TYPE=Release \ + '$(TARGET)-cmake' '$(1)' \ -DCMAKE_RELEASE_POSTFIX='' \ -DBoost_THREADAPI=win32 $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1)' -j 1 VERBOSE=1 diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk index 100993d..8f8d4b3 100644 --- a/src/jsoncpp.mk +++ b/src/jsoncpp.mk @@ -22,12 +22,10 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ -DCMAKE_CXX_FLAGS="$($(PKG)_CXXFLAGS)" \ -DJSONCPP_WITH_CMAKE_PACKAGE=ON \ - -DBUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true) + -DBUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install endef diff --git a/src/lapack.mk b/src/lapack.mk index c2aad44..ddfb3bf 100644 --- a/src/lapack.mk +++ b/src/lapack.mk @@ -17,8 +17,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)' && '$(TARGET)-cmake' \ -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ -DLAPACKE=ON \ diff --git a/src/lensfun.mk b/src/lensfun.mk index bf945b1..f82b991 100644 --- a/src/lensfun.mk +++ b/src/lensfun.mk @@ -19,8 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/building' - cd '$(1)/building' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/building' && '$(TARGET)-cmake' .. \ -DBUILD_STATIC=$(if $(BUILD_STATIC),TRUE,FALSE) \ -DINSTALL_IN_TREE=NO $(MAKE) -C '$(1)/building' -j '$(JOBS)' install VERBOSE=1 diff --git a/src/libcomm14cux.mk b/src/libcomm14cux.mk index 8d1f0d3..fa2cf98 100644 --- a/src/libcomm14cux.mk +++ b/src/libcomm14cux.mk @@ -12,8 +12,7 @@ $(PKG)_DEPS := gcc define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DBUILD_STATIC=$(if $(BUILD_STATIC),ON,OFF) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install diff --git a/src/libftdi1.mk b/src/libftdi1.mk index bbf6d99..2968540 100644 --- a/src/libftdi1.mk +++ b/src/libftdi1.mk @@ -18,9 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DCMAKE_BUILD_TYPE=Release \ + cd '$(1)' && '$(TARGET)-cmake' . \ -DSHAREDLIBS=$(if $(BUILD_SHARED),yes,no) \ -DSTATICLIBS=$(if $(BUILD_SHARED),no,yes) \ -DLIBUSB_INCLUDE_DIR=$(PREFIX)/$(TARGET)/include/libusb-1.0 \ diff --git a/src/libgit2.mk b/src/libgit2.mk index cad3941..3467f38 100644 --- a/src/libgit2.mk +++ b/src/libgit2.mk @@ -12,10 +12,8 @@ $(PKG)_DEPS := gcc libssh2 define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1).build' && '$(TARGET)-cmake' \ -DDLLTOOL='$(PREFIX)/bin/$(TARGET)-dlltool' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1).build' -j 1 VERBOSE=1 $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1 diff --git a/src/libmysqlclient.mk b/src/libmysqlclient.mk index dd322be..d72fa44 100644 --- a/src/libmysqlclient.mk +++ b/src/libmysqlclient.mk @@ -25,9 +25,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).native' -j '$(JOBS)' VERBOSE=1 # cross-compilation mkdir '$(1).build' - cd '$(1).build' && cmake \ - -DCMAKE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1).build' && '$(TARGET)-cmake' \ -DIMPORT_COMP_ERR='$(1).native/ImportCompErr.cmake' \ -DHAVE_GCC_ATOMIC_BUILTINS=1 \ -DDISABLE_SHARED=$(CMAKE_STATIC_BOOL) \ diff --git a/src/libsvm.mk b/src/libsvm.mk index a135026..f6587d5 100644 --- a/src/libsvm.mk +++ b/src/libsvm.mk @@ -18,10 +18,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ - '$(1)' + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' $(MAKE) -C '$(1).build' install diff --git a/src/libwebsockets.mk b/src/libwebsockets.mk index 4b2056c..4ab7573 100644 --- a/src/libwebsockets.mk +++ b/src/libwebsockets.mk @@ -15,10 +15,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake \ + cd '$(1)' && '$(TARGET)-cmake' \ -DLWS_WITHOUT_TESTAPPS=ON \ - -DLWS_USE_EXTERNAL_ZLIB=ON \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + -DLWS_USE_EXTERNAL_ZLIB=ON $(MAKE) -C '$(1)' -j $(JOBS) $(MAKE) -C '$(1)' install endef diff --git a/src/llvm.mk b/src/llvm.mk index ef84e1e..58f1f1c 100644 --- a/src/llvm.mk +++ b/src/llvm.mk @@ -19,10 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DLIBTYPE=$(if $(BUILD_STATIC),STATIC,SHARED) \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DLLVM_BUILD_TOOLS=OFF $(MAKE) -C '$(1)/build' -j $(JOBS) llvm-tblgen $(MAKE) -C '$(1)/build' -j $(JOBS) intrinsics_gen diff --git a/src/luabind.mk b/src/luabind.mk index ba75bdf..4f209c6 100644 --- a/src/luabind.mk +++ b/src/luabind.mk @@ -19,8 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1).build' && '$(TARGET)-cmake' \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1).build' -j 1 VERBOSE=1 $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1 @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && $(TARGET)-cmake '$(1)' \ + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ -DOCE_BUILD_SHARED_LIB=$(if $(BUILD_STATIC),FALSE,TRUE) \ -DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \ -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ @@ -31,7 +31,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 $(MAKE) -C '$(1).build' -j 1 install - cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)/examples/find_package_oce' && '$(TARGET)-cmake' . $(MAKE) -C '$(1)/examples/find_package_oce' endef diff --git a/src/openal.mk b/src/openal.mk index f77e787..096c07e 100644 --- a/src/openal.mk +++ b/src/openal.mk @@ -18,9 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DLIBTYPE=$(if $(BUILD_SHARED),SHARED,STATIC) \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DALSOFT_EXAMPLES=FALSE \ -DALSOFT_UTILS=FALSE $(MAKE) -C '$(1)/build' -j '$(JOBS)' install diff --git a/src/opencv.mk b/src/opencv.mk index 60aa4c9..77f01ec 100644 --- a/src/opencv.mk +++ b/src/opencv.mk @@ -21,14 +21,13 @@ endef define $(PKG)_BUILD # build mkdir '$(1).build' - cd '$(1).build' && cmake \ + cd '$(1).build' && '$(TARGET)-cmake' \ -DWITH_QT=OFF \ -DWITH_OPENGL=ON \ -DWITH_GSTREAMER=OFF \ -DWITH_GTK=OFF \ -DWITH_VIDEOINPUT=ON \ -DWITH_XINE=OFF \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) \ -DBUILD_opencv_apps=OFF \ -DBUILD_DOCS=OFF \ -DBUILD_EXAMPLES=OFF \ @@ -44,7 +43,6 @@ define $(PKG)_BUILD -DBUILD_PNG=OFF \ -DBUILD_OPENEXR=OFF \ -DCMAKE_VERBOSE=ON \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_CXX_FLAGS='-D_WIN32_WINNT=0x0500' \ '$(1)' diff --git a/src/openjpeg.mk b/src/openjpeg.mk index a6b9d4b..bac0828 100644 --- a/src/openjpeg.mk +++ b/src/openjpeg.mk @@ -21,9 +21,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ + cd '$(1).build' && '$(TARGET)-cmake' \ -DBUILD_TESTING=FALSE \ '$(1)' $(MAKE) -C '$(1).build' install diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 09ae638..bd958da 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -23,8 +23,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake '$(1)' \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ -DCMAKE_CXX_FLAGS='-D__STDC_CONSTANT_MACROS' \ -DCMAKE_HAVE_PTHREAD_H=OFF \ -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ @@ -28,10 +28,8 @@ define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && \ CXXFLAGS="-D__FLOAT_H -DFLT_MAX=__FLT_MAX__ -DFLT_MIN=__FLT_MIN__ -DDBL_MAX=__DBL_MAX__ -DDBL_MIN=__DBL_MIN__ -DDBL_EPSILON=__DBL_EPSILON__" \ - cmake '$(1)' \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + '$(TARGET)-cmake' '$(1)' \ -DVTK_DIR='$(PREFIX)/$(TARGET)/lib/vtk-5.8' \ - -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_RELEASE_POSTFIX='' \ -DBoost_THREADAPI=win32 \ -DPCL_SHARED_LIBS=OFF \ diff --git a/src/pfstools.mk b/src/pfstools.mk index 76fafa3..ed5edee 100644 --- a/src/pfstools.mk +++ b/src/pfstools.mk @@ -20,8 +20,7 @@ endef # only want the library so we don't need them. define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake '$(1)' \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ -DWITH_OpenEXR=false \ -DWITH_ImageMagick=false \ diff --git a/src/physfs.mk b/src/physfs.mk index 9fc4e31..3075d22 100644 --- a/src/physfs.mk +++ b/src/physfs.mk @@ -18,8 +18,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)' && '$(TARGET)-cmake' . \ $(if $(BUILD_SHARED), \ -DPHYSFS_BUILD_SHARED=TRUE \ -DPHYSFS_BUILD_STATIC=FALSE, \ diff --git a/src/polarssl.mk b/src/polarssl.mk index 4218c9e..42529d4 100644 --- a/src/polarssl.mk +++ b/src/polarssl.mk @@ -23,8 +23,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DUSE_STATIC_POLARSSL_LIBRARY=$(CMAKE_STATIC_BOOL) \ -DUSE_SHARED_POLARSSL_LIBRARY=$(CMAKE_SHARED_BOOL) \ -DENABLE_TESTING=OFF \ diff --git a/src/portmidi.mk b/src/portmidi.mk index 7a1635a..40b2a39 100644 --- a/src/portmidi.mk +++ b/src/portmidi.mk @@ -19,8 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)/build' && '$(TARGET)-cmake' .. $(MAKE) -C '$(1)/build' -j '$(JOBS)' portmidi-$(if $(BUILD_STATIC),static,dynamic) diff --git a/src/qhttpengine.mk b/src/qhttpengine.mk index eeed40a..b9592ae 100644 --- a/src/qhttpengine.mk +++ b/src/qhttpengine.mk @@ -12,8 +12,7 @@ $(PKG)_DEPS := gcc qtbase define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DBUILD_STATIC=$(if $(BUILD_STATIC),ON,OFF) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install diff --git a/src/qjson.mk b/src/qjson.mk index 64822ff..a2e0de4 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -19,8 +19,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)/build' && '$(TARGET)-cmake' .. $(MAKE) -C '$(1)/build' -j '$(JOBS)' install diff --git a/src/rucksack.mk b/src/rucksack.mk index 9e190e1..6928f90 100644 --- a/src/rucksack.mk +++ b/src/rucksack.mk @@ -18,7 +18,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)/build' && '$(TARGET)-cmake' .. $(MAKE) -C '$(1)/build' -j '$(JOBS)' \ rucksack_static \ diff --git a/src/sdl_image.mk b/src/sdl_image.mk index 92edeb1..9d42723 100644 --- a/src/sdl_image.mk +++ b/src/sdl_image.mk @@ -43,8 +43,7 @@ define $(PKG)_BUILD mkdir -p '$(1)/cmake-build-test' cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt' cp '$(PWD)/src/$(PKG)-test.c' '$(1)/cmake-build-test/' - cd '$(1)/cmake-build-test' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)/cmake-build-test' && '$(TARGET)-cmake' $(MAKE) -C '$(1)/cmake-build-test' -j '$(JOBS)' endef diff --git a/src/sdl_sound.mk b/src/sdl_sound.mk index add6c60..7b4f3c1 100644 --- a/src/sdl_sound.mk +++ b/src/sdl_sound.mk @@ -62,8 +62,7 @@ define $(PKG)_BUILD mkdir -p '$(1)/cmake-build-test' cp '$(PWD)/src/$(PKG)-test-CMakeLists.txt' '$(1)/cmake-build-test/CMakeLists.txt' cp '$(PWD)/src/$(PKG)-test.c' '$(1)/cmake-build-test/' - cd '$(1)/cmake-build-test' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)/cmake-build-test' && '$(TARGET)-cmake' . $(MAKE) -C '$(1)/cmake-build-test' -j '$(JOBS)' endef diff --git a/src/sfml.mk b/src/sfml.mk index 866fdf2..0d2917c 100644 --- a/src/sfml.mk +++ b/src/sfml.mk @@ -19,15 +19,14 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DSFML_BUILD_EXAMPLES=FALSE \ -DSFML_BUILD_DOC=FALSE # build and install libs $(MAKE) -C '$(1)/build/src/SFML' -j '$(JOBS)' install VERBOSE=1 # install headers - cmake -DCOMPONENT=devel -P '$(1)/build/cmake_install.cmake' + '$(TARGET)-cmake' -DCOMPONENT=devel -P '$(1)/build/cmake_install.cmake' # create pkg-config file $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' diff --git a/src/taglib.mk b/src/taglib.mk index 314143e..8f99497 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -17,8 +17,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DENABLE_STATIC=$(CMAKE_STATIC_BOOL) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install endef diff --git a/src/teem.mk b/src/teem.mk index ef8eaa9..54658b0 100644 --- a/src/teem.mk +++ b/src/teem.mk @@ -19,8 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)' && '$(TARGET)-cmake' . \ -DQNANHIBIT_VALUE=1 -DQNANHIBIT_VALUE__TRYRUN_OUTPUT=1 $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 endef diff --git a/src/tinyxml.mk b/src/tinyxml.mk index 3a7ef23..fabf295 100644 --- a/src/tinyxml.mk +++ b/src/tinyxml.mk @@ -20,10 +20,7 @@ endef define $(PKG)_BUILD mkdir '$(1).build' - cd '$(1).build' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ - '$(1)' + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' $(MAKE) -C '$(1).build' install '$(TARGET)-g++' \ diff --git a/src/vidstab.mk b/src/vidstab.mk index bb84c33..3dd95ee 100644 --- a/src/vidstab.mk +++ b/src/vidstab.mk @@ -20,8 +20,7 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + cd '$(1)/build' && '$(TARGET)-cmake' .. $(MAKE) -C '$(1)/build' -j $(JOBS) $(MAKE) -C '$(1)/build' -j 1 install @@ -29,4 +28,4 @@ define $(PKG)_BUILD -W -Wall -Werror -pedantic \ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-vidstab.exe' \ `'$(TARGET)-pkg-config' --static --cflags --libs vidstab` -endef
\ No newline at end of file +endef diff --git a/src/vigra.mk b/src/vigra.mk index 7615daf..d5096fa 100644 --- a/src/vigra.mk +++ b/src/vigra.mk @@ -26,9 +26,7 @@ define $(PKG)_BUILD $(SED) -i 's,\bSHARED\b,STATIC,' '$(1)/config/VIGRA_ADD_NUMPY_MODULE.cmake' $(SED) -i 's,\bSHARED\b,STATIC,' '$(1)/vigranumpy/test/CMakeLists.txt' mkdir '$(1)/build' - cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DLIBTYPE=STATIC \ + cd '$(1)/build' && '$(TARGET)-cmake' .. \ -DVIGRA_STATIC_LIB=1 \ -DWITH_HDF5=OFF \ -DWITH_VIGRANUMPY=OFF \ @@ -35,9 +35,8 @@ define $(PKG)_BUILD # now for the cross compilation mkdir '$(1)/cross_build' - cd '$(1)/cross_build' && cmake \ + cd '$(1)/cross_build' && '$(TARGET)-cmake' \ -C '$(1)/TryRunResults.cmake'\ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)'\ -DBUILD_TESTING=FALSE\ -DVTKCompileTools_DIR='$(1)/native_build'\ -DVTK_USE_SYSTEM_EXPAT=TRUE\ diff --git a/src/vtk6.mk b/src/vtk6.mk index 05fec10..7891466 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -39,9 +39,8 @@ define $(PKG)_BUILD # now the cross compilation mkdir '$(1).cross_build' - cd '$(1).cross_build' && cmake \ + cd '$(1).cross_build' && '$(TARGET)-cmake' \ -C '$(1)/TryRunResults.cmake' \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DVTKCompileTools_DIR='$(1).native_build' \ -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),FALSE,TRUE) \ -DModule_vtkGUISupportQt=TRUE \ @@ -59,8 +58,7 @@ define $(PKG)_BUILD #now build the GUI -> Qt -> SimpleView Example mkdir '$(1).test' - cd '$(1).test' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1).test' && '$(TARGET)-cmake' \ '$(1)/Examples/GUI/Qt/SimpleView' $(MAKE) -C '$(1).test' -j '$(JOBS)' VERBOSE=1 endef @@ -21,7 +21,7 @@ endef define $(PKG)_BUILD # build wt libraries mkdir '$(1).build' - cd '$(1).build' && cmake \ + cd '$(1).build' && '$(TARGET)-cmake' \ -DCONFIGDIR='$(PREFIX)/$(TARGET)/etc/wt' \ -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTS=OFF \ @@ -36,7 +36,6 @@ define $(PKG)_BUILD -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \ -DENABLE_QT4=ON \ -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1).build' -j 1 VERBOSE=1 $(MAKE) -C '$(1).build' -j 1 install VERBOSE=1 |