luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #496 fixed (CentOS 8 builds)

This commit is contained in:
Matthias Koefferlein 2020-02-21 19:14:01 +01:00
parent 946af71f2f
commit fa49209419
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -591,8 +591,6 @@ qmake_options=(
-recursive
CONFIG+="$CONFIG"
RUBYLIBFILE="$RUBYLIBFILE"
RUBYINCLUDE="$RUBYINCLUDE"
RUBYINCLUDE2="$RUBYINCLUDE2"
RUBYVERSIONCODE="$RUBYVERSIONCODE"
HAVE_RUBY="$HAVE_RUBY"
PYTHON="$PYTHON"
@ -613,6 +611,16 @@ qmake_options=(
KLAYOUT_VERSION_REV="$KLAYOUT_VERSION_REV"
)
# NOTE: qmake does not like include paths which clash with paths built into the compiler
# hence we don't add RUBYINCLUDE or RUBYINCLUDE2 in this case (found on CentOS 8 where Ruby
# headers are installed in /usr/include)
if [ "$RUBYINCLUDE" != "/usr/include" ] && [ "$RUBYINCLUDE" != "/usr/local/include" ]; then
qmake_options+=( RUBYINCLUDE="$RUBYINCLUDE" )
fi
if [ "$RUBYINCLUDE2" != "/usr/include" ] && [ "$RUBYINCLUDE2" != "/usr/local/include" ]; then
qmake_options+=( RUBYINCLUDE2="$RUBYINCLUDE2" )
fi
# This should speed up build time considerably
# https://ortogonal.github.io/ccache-and-qmake-qtcreator/
if [ "$QMAKE_CCACHE" = 1 ]; then