diff options
| author | Martin Müllenhaupt <mm@netlair.de> | 2014-10-08 15:58:08 (GMT) |
|---|---|---|
| committer | Martin Müllenhaupt <mm@netlair.de> | 2014-10-08 15:58:08 (GMT) |
| commit | 3ce38c81386478e8a6d2225b792cdd94367a6da7 (patch) | |
| tree | 8cce5155fd9d22a6b8e0706ff444bec92cc0df17 /src | |
| parent | 570c9ee42a3591b6736dd2a90300c600d14bf095 (diff) | |
| download | mxe-3ce38c81386478e8a6d2225b792cdd94367a6da7.zip mxe-3ce38c81386478e8a6d2225b792cdd94367a6da7.tar.gz mxe-3ce38c81386478e8a6d2225b792cdd94367a6da7.tar.bz2 | |
move CMAKE_MODULE_PATH into toolchain config
Diffstat (limited to 'src')
| -rw-r--r-- | src/oce.mk | 3 | ||||
| -rw-r--r-- | src/pkgconf.mk | 1 |
2 files changed, 2 insertions, 2 deletions
@@ -24,8 +24,7 @@ define $(PKG)_BUILD -DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \ -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ - -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE \ - -DCMAKE_MODULE_PATH=$(PWD)/src/cmake + -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 diff --git a/src/pkgconf.mk b/src/pkgconf.mk index a644be9..55c9cf5 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -59,6 +59,7 @@ define $(PKG)_BUILD_COMMON 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) # 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') \ |