diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-09-07 12:58:19 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-09-12 03:43:05 (GMT) |
| commit | 44438d6e6a7440173e20ec0ae9f205d899cceba9 (patch) | |
| tree | 5bf49ef4b3e3edf4fd93f8b5b15009a860bcff92 /src | |
| parent | 19d1be38aeedcbbb6219c17ad09464f655f39d02 (diff) | |
| download | mxe-44438d6e6a7440173e20ec0ae9f205d899cceba9.zip mxe-44438d6e6a7440173e20ec0ae9f205d899cceba9.tar.gz mxe-44438d6e6a7440173e20ec0ae9f205d899cceba9.tar.bz2 | |
boost hdf5 qt qtbase: write to $(CMAKE_TOOLCHAIN_DIR) instead of $(CMAKE_TOOLCHAIN_FILE)
Fixes #823
Diffstat (limited to 'src')
| -rw-r--r-- | src/boost.mk | 3 | ||||
| -rw-r--r-- | src/hdf5.mk | 3 | ||||
| -rw-r--r-- | src/qt.mk | 3 | ||||
| -rw-r--r-- | src/qtbase.mk | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/boost.mk b/src/boost.mk index 954fd15..e230020 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -61,8 +61,7 @@ define $(PKG)_BUILD mv -fv '$(PREFIX)/$(TARGET)/lib/'libboost_*.dll '$(PREFIX)/$(TARGET)/bin/') # setup cmake toolchain - $(SED) -i '/Boost_THREADAPI/d' '$(CMAKE_TOOLCHAIN_FILE)' - echo 'set(Boost_THREADAPI "win32")' >> '$(CMAKE_TOOLCHAIN_FILE)' + echo 'set(Boost_THREADAPI "win32")' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' '$(TARGET)-g++' \ -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \ diff --git a/src/hdf5.mk b/src/hdf5.mk index 47c8447..1b0ca5c 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -60,10 +60,9 @@ define $(PKG)_BUILD $(INSTALL) -m755 '$(1)'/c++/src/h5c++ '$(PREFIX)/bin/$(TARGET)-h5c++' # setup cmake toolchain - $(SED) -i '/HDF5/d' '$(CMAKE_TOOLCHAIN_FILE)' (echo 'set(HDF5_C_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5cc)'; \ echo 'set(HDF5_CXX_COMPILER_EXECUTABLE $(PREFIX)/bin/$(TARGET)-h5c++)'; \ - ) >> '$(CMAKE_TOOLCHAIN_FILE)' + ) > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' ## test hdf5 '$(TARGET)-g++' \ @@ -113,8 +113,7 @@ define $(PKG)_BUILD `'$(TARGET)-pkg-config' QtGui --cflags --libs` # setup cmake toolchain - $(SED) -i '/QT_QMAKE_EXECUTABLE/d' '$(CMAKE_TOOLCHAIN_FILE)' - echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)' >> '$(CMAKE_TOOLCHAIN_FILE)' + echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' endef diff --git a/src/qtbase.mk b/src/qtbase.mk index f04e3cc..07cb36b 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -79,8 +79,7 @@ define $(PKG)_BUILD `'$(TARGET)-pkg-config' Qt5Widgets --cflags --libs` # setup cmake toolchain - $(SED) -i '/CMAKE_SYSTEM_PREFIX_PATH/d' '$(CMAKE_TOOLCHAIN_FILE)' - echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' >> '$(CMAKE_TOOLCHAIN_FILE)' + echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' # batch file to run test programs (printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \ |