Mercurial > mxe-octave
changeset 2142:276f0c6d3cca
packages cgal, eigen, lapack: use CMAKE_TOOLCHAIN_FILE
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Sun, 27 Nov 2011 00:45:44 +1100 |
| parents | 574353ed434c |
| children | ea0ef211bc28 |
| files | src/cgal.mk src/eigen.mk src/lapack.mk |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cgal.mk Sat Nov 26 14:22:08 2011 +0100 +++ b/src/cgal.mk Sun Nov 27 00:45:44 2011 +1100 @@ -28,7 +28,7 @@ -DCGAL_INSTALL_BIN_DIR:STRING="bin" \ -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ -DWITH_CGAL_Qt3:BOOL="0" \ - -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DBOOST_COMPILER=_win32 \ -DBOOST_THREAD_USE_LIB=1 \ -DBOOST_USE_STATIC_LIBS=1 \ @@ -37,7 +37,7 @@ cd '$(1)/examples/AABB_tree' && cmake \ -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \ -DWITH_CGAL_Qt3:BOOL="0" \ - -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DBOOST_COMPILER=_win32 \ -DBOOST_THREAD_USE_LIB=1 \ -DBOOST_USE_STATIC_LIBS=1 \
--- a/src/eigen.mk Sat Nov 26 14:22:08 2011 +0100 +++ b/src/eigen.mk Sun Nov 27 00:45:44 2011 +1100 @@ -21,6 +21,6 @@ define $(PKG)_BUILD cd '$(1)' && \ - cmake . -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake + cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef
--- a/src/lapack.mk Sat Nov 26 14:22:08 2011 +0100 +++ b/src/lapack.mk Sun Nov 27 00:45:44 2011 +1100 @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ - -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/$(TARGET)/share/cmake/mingw-cross-env-conf.cmake \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ . $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install