diff options
author | Volker Grabsch <vog@notjusthosting.com> | 2012-08-13 08:15:30 (GMT) |
---|---|---|
committer | Volker Grabsch <vog@notjusthosting.com> | 2012-08-13 08:15:30 (GMT) |
commit | e57db6d8c9c7ecbe43dd1fdb3d17f07871dfc9fb (patch) | |
tree | 347da45464b3306b1a2af582781d517bcb4d8dd5 /src | |
parent | 061d064c47a0a04b8b989cc6271e7de9b85f2ed1 (diff) | |
download | mxe-e57db6d8c9c7ecbe43dd1fdb3d17f07871dfc9fb.zip mxe-e57db6d8c9c7ecbe43dd1fdb3d17f07871dfc9fb.tar.gz mxe-e57db6d8c9c7ecbe43dd1fdb3d17f07871dfc9fb.tar.bz2 |
Move CMAKE_BUILD_TYPE, CMAKE_AR and CMAKE_RANLIB into toolchain file
Diffstat (limited to 'src')
-rw-r--r-- | src/cgal.mk | 1 | ||||
-rw-r--r-- | src/gcc.mk | 7 | ||||
-rw-r--r-- | src/lapack.mk | 2 | ||||
-rw-r--r-- | src/qjson.mk | 1 | ||||
-rw-r--r-- | src/vtk.mk | 1 | ||||
-rw-r--r-- | src/wt.mk | 1 |
6 files changed, 5 insertions, 8 deletions
diff --git a/src/cgal.mk b/src/cgal.mk index a5bab36..69e4a02 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -19,7 +19,6 @@ endef 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" \ @@ -59,9 +59,10 @@ define $(PKG)_BUILD # create the CMake toolchain file [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' - (echo 'set(BUILD_SHARED_LIBS OFF)'; \ - echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ + (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)'; \ @@ -70,6 +71,8 @@ define $(PKG)_BUILD 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")'; \ diff --git a/src/lapack.mk b/src/lapack.mk index c9c8959..4b88d20 100644 --- a/src/lapack.mk +++ b/src/lapack.mk @@ -19,8 +19,6 @@ endef 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 diff --git a/src/qjson.mk b/src/qjson.mk index 7bb8422..08a3c45 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -20,7 +20,6 @@ define $(PKG)_BUILD 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 @@ -21,7 +21,6 @@ define $(PKG)_BUILD # 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 \ @@ -33,7 +33,6 @@ define $(PKG)_BUILD -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 |