From 2beb76e10d583bd174a808d829bc50255c1feb07 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 22 Nov 2014 16:38:02 -0800 Subject: mxe-conf.cmake: Add Boost_THREADAPI Closes #560. --- src/pkgconf.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pkgconf.mk b/src/pkgconf.mk index f6edb1f..fd2fae9 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -55,15 +55,16 @@ define $(PKG)_BUILD_COMMON echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \ echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ - echo 'set(HDF5_C_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5cc)'; \ - echo 'set(HDF5_CXX_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5c++)'; \ - echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ - echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)'; \ echo 'set(CMAKE_MODULE_PATH "$(PWD)/src/cmake" $${CMAKE_MODULE_PATH}) # For mxe FindPackage scripts'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")'; \ echo 'set(CMAKE_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075'; \ echo 'set(CMAKE_RC_COMPILE_OBJECT " -O coff -o ") # Workaround for buggy windres rules'; \ + echo 'set(HDF5_C_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5cc)'; \ + echo 'set(HDF5_CXX_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5c++)'; \ + echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ + echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)'; \ + echo 'set(Boost_THREADAPI "win32")'; \ ) > '$(CMAKE_TOOLCHAIN_FILE)' endef -- cgit v0.12