Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-09-20 02:30:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

base/cmake: Do not pass toolchain option when using incompatible cmake option

Browse Source 
Also revert the changes to ccmake.sh, the restriction doesn't apply to it.

Suggested-by: Matt McCormick <matt.mccormick@kitware.com>
This commit is contained in:
Jean-Christophe Fillion-Robin 2016-09-21 21:11:33 -04:00
parent ff2512b785
commit 4876f14356
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imagefiles/ccmake.sh
View File

@ -3,12 +3,5 @@
# Always pass the CMAKE_TOOLCHAIN_FILE variable to CMake when inside a # Always pass the CMAKE_TOOLCHAIN_FILE variable to CMake when inside a
# dockcross environment -- the CMAKE_TOOLCHAIN_FILE environmental variable is # dockcross environment -- the CMAKE_TOOLCHAIN_FILE environmental variable is
# always set in this context # always set in this context
#
# Passing of the option can be disabled setting environment variable
# DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE to 0
if [ "${DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE}" == "0" ];then exec /usr/bin/ccmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} "$@"
exec /usr/bin/ccmake "$@"
else
exec /usr/bin/ccmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} "$@"
fi

22
imagefiles/cmake.sh
View File

@ -3,12 +3,20 @@
# Always pass the CMAKE_TOOLCHAIN_FILE variable to CMake when inside a # Always pass the CMAKE_TOOLCHAIN_FILE variable to CMake when inside a
# dockcross environment -- the CMAKE_TOOLCHAIN_FILE environmental variable is # dockcross environment -- the CMAKE_TOOLCHAIN_FILE environmental variable is
# always set in this context # always set in this context
#
# Passing of the option can be disabled setting environment variable
# DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE to 0
if [ "${DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE}" == "0" ];then # Exception:
#
# Do not pass the toolchain when calling CMake with these options:
# -E = CMake command mode.
# --build <dir> = Build a CMake-generated project binary tree.
# --find-package = Run in pkg-config like mode.
#
case $1 in
-E|--build|--find-package)
exec /usr/bin/cmake "$@" exec /usr/bin/cmake "$@"
else ;;
exec /usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} "$@"
fi esac
exec /usr/bin/cmake -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE} "$@"

1
manylinux-x64/Dockerfile.in
View File

@ -25,5 +25,4 @@ COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
COPY manylinux-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/ COPY manylinux-x64/Toolchain.cmake ${CROSS_ROOT}/../lib/
ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/../lib/Toolchain.cmake
ENV DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE 0
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x64 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux-x64