From 3ce38c81386478e8a6d2225b792cdd94367a6da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Wed, 8 Oct 2014 17:58:08 +0200 Subject: move CMAKE_MODULE_PATH into toolchain config --- src/oce.mk | 3 +-- src/pkgconf.mk | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/oce.mk b/src/oce.mk index 0dcaf58..d03e566 100644 --- a/src/oce.mk +++ b/src/oce.mk @@ -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') \ -- cgit v0.12