summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2011-11-26 13:45:44 (GMT)
committerTony Theodore <tonyt@logyst.com>2011-11-26 13:45:44 (GMT)
commitb3db8131746da6256ad052f236c7ac7f3f455d11 (patch)
tree539d690420863dc09d5a839ad855298ffdb19c33 /src
parent195056287da03a09e62b11581df2249341fef358 (diff)
downloadmxe-b3db8131746da6256ad052f236c7ac7f3f455d11.zip
mxe-b3db8131746da6256ad052f236c7ac7f3f455d11.tar.gz
mxe-b3db8131746da6256ad052f236c7ac7f3f455d11.tar.bz2
packages cgal, eigen, lapack: use CMAKE_TOOLCHAIN_FILE
Diffstat (limited to 'src')
-rw-r--r--src/cgal.mk4
-rw-r--r--src/eigen.mk2
-rw-r--r--src/lapack.mk2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/cgal.mk b/src/cgal.mk
index 455a9b8..faf63e2 100644
--- a/src/cgal.mk
+++ b/src/cgal.mk
@@ -28,7 +28,7 @@ define $(PKG)_BUILD
-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 @@ define $(PKG)_BUILD
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 \
diff --git a/src/eigen.mk b/src/eigen.mk
index 9716664..1664486 100644
--- a/src/eigen.mk
+++ b/src/eigen.mk
@@ -21,6 +21,6 @@ endef
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
diff --git a/src/lapack.mk b/src/lapack.mk
index dd48a0d..02149b9 100644
--- a/src/lapack.mk
+++ b/src/lapack.mk
@@ -21,7 +21,7 @@ endef
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