d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: no -DCMAKE_TOOLCHAIN_FILE with some options 

CMake with a toolchain file doesn't work properly in some modes.

  * --build
  * --system-information
  * -E

close #932
This commit is contained in:
Boris Nagaev 2015-10-15 01:36:56 +03:00
parent abe8bc23e9
commit 0ef2cb3b40
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mxe-conf.mk
View File

@ -46,9 +46,21 @@ define $(PKG)_BUILD_COMMON
) > '$(CMAKE_TOOLCHAIN_FILE)'
#create prefixed cmake wrapper script
(echo '#!/bin/sh'; \
echo 'echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \
echo 'exec cmake -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"') \
(echo '#!/usr/bin/env bash'; \
echo 'echo "== Using MXE wrapper: $(PREFIX)/bin/$(TARGET)-cmake"'; \
echo 'unset NO_MXE_TOOLCHAIN'; \
echo 'if echo -- "$$@" | grep -Ewq "(--build|-E|--system-information)" ; then'; \
echo ' NO_MXE_TOOLCHAIN=1'; \
echo 'fi'; \
echo 'if [[ "$$NO_MXE_TOOLCHAIN" == "1" ]]; then'; \
echo ' echo "== Skip using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \
echo ' # see https://github.com/mxe/mxe/issues/932'; \
echo ' exec cmake "$$@"'; \
echo 'else'; \
echo ' echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \
echo ' exec cmake -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \
echo 'fi'; \
) \
> '$(PREFIX)/bin/$(TARGET)-cmake'
chmod 0755 '$(PREFIX)/bin/$(TARGET)-cmake'