Mercurial > mxe-octave
changeset 2706:130456fea205
Revert "Move CMAKE_BUILD_TYPE, CMAKE_AR and CMAKE_RANLIB into toolchain file"
This reverts commit e57db6d8c9c7ecbe43dd1fdb3d17f07871dfc9fb.
See http://lists.nongnu.org/archive/html/mingw-cross-env-list/2012-08/msg00028.html
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Sat, 25 Aug 2012 16:11:23 +0200 |
parents | 2dad6359bc72 |
children | 4c2874e00f0c |
files | src/cgal.mk src/gcc.mk src/lapack.mk src/qjson.mk src/vtk.mk src/wt.mk |
diffstat | 6 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cgal.mk Sat Aug 25 11:32:18 2012 +0200 +++ b/src/cgal.mk Sat Aug 25 16:11:23 2012 +0200 @@ -19,6 +19,7 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ -DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \ + -DCMAKE_BUILD_TYPE:STRING="Release" \ -DCGAL_INSTALL_INC_DIR:STRING="include" \ -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.9" \ -DCGAL_INSTALL_BIN_DIR:STRING="bin" \
--- a/src/gcc.mk Sat Aug 25 11:32:18 2012 +0200 +++ b/src/gcc.mk Sat Aug 25 16:11:23 2012 +0200 @@ -59,10 +59,9 @@ # create the CMake toolchain file [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' - (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ + (echo 'set(BUILD_SHARED_LIBS OFF)'; \ + echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ echo 'set(MSYS 1)'; \ - echo 'set(BUILD_SHARED_LIBS OFF)'; \ - echo 'set(CMAKE_BUILD_TYPE Release)'; \ echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \ echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \ @@ -71,8 +70,6 @@ echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \ echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ - echo 'set(CMAKE_AR $(PREFIX)/bin/$(TARGET)-ar)'; \ - echo 'set(CMAKE_RANLIB $(PREFIX)/bin/$(TARGET)-ranlib)'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \
--- a/src/lapack.mk Sat Aug 25 11:32:18 2012 +0200 +++ b/src/lapack.mk Sat Aug 25 16:11:23 2012 +0200 @@ -19,6 +19,8 @@ define $(PKG)_BUILD cd '$(1)' && cmake \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ + -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ . $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install
--- a/src/qjson.mk Sat Aug 25 11:32:18 2012 +0200 +++ b/src/qjson.mk Sat Aug 25 16:11:23 2012 +0200 @@ -20,6 +20,7 @@ mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_BUILD_TYPE=Release \ -DLIBTYPE=STATIC $(MAKE) -C '$(1)/build' -j '$(JOBS)' install
--- a/src/vtk.mk Sat Aug 25 11:32:18 2012 +0200 +++ b/src/vtk.mk Sat Aug 25 16:11:23 2012 +0200 @@ -21,6 +21,7 @@ # first we need a native build to create the compile tools mkdir '$(1)/native_build' cd '$(1)/native_build' && cmake \ + -DCMAKE_BUILD_TYPE='Release' \ -DBUILD_TESTING=FALSE \ -DOPENGL_INCLUDE_DIR='$(1)/Utilities/ParseOGLExt/headers' \ -DVTK_USE_RENDERING=FALSE \
--- a/src/wt.mk Sat Aug 25 11:32:18 2012 +0200 +++ b/src/wt.mk Sat Aug 25 16:11:23 2012 +0200 @@ -33,6 +33,7 @@ -DPANGO_FT2_LIBS="`'$(TARGET)-pkg-config' --libs-only-l pangoft2`" \ -DWT_CMAKE_FINDER_INSTALL_DIR='/lib/wt' \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCMAKE_BUILD_TYPE:STRING="Release" \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef