1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust configure -cmake to accept both single and double dash arguments

Browse Source 
This uses sed -E (extended regular expressions) to improve readability of
regular expressions. Shouldn't be a problem on most modern systems.

Change-Id: I12c9834c1ef83bf5f8547bccff655a6b8525cc3d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Dimitrios Apostolou 2020-06-24 23:05:04 +02:00
parent 52a7d2e3a3
commit 33714b6c02
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -149,23 +149,18 @@ $i"
CMAKE_CMDLINE="$CMAKE_CMDLINE CMAKE_CMDLINE="$CMAKE_CMDLINE
-DQT_NO_MAKE_${arg_capitalized}=ON" -DQT_NO_MAKE_${arg_capitalized}=ON"
;; ;;
-feature-*) -feature-*|--feature-*)
VAR=`echo $i | sed 's,^-feature-\(.*\),\1,'` VAR=`echo $i | sed -E 's/-?-feature-(.*)/\1/'`
CMAKE_CMDLINE="$CMAKE_CMDLINE CMAKE_CMDLINE="$CMAKE_CMDLINE
-DQT_FEATURE_${VAR}=ON" -DQT_FEATURE_${VAR}=ON"
;; ;;
-no-feature-*) -no-feature-*|--no-feature-*)
VAR=`echo $i | sed 's,^-no-feature-\(.*\),\1,'` VAR=`echo $i | sed -E 's/-?-no-feature-(.*)/\1/'`
CMAKE_CMDLINE="$CMAKE_CMDLINE CMAKE_CMDLINE="$CMAKE_CMDLINE
-DQT_FEATURE_${VAR}=OFF" -DQT_FEATURE_${VAR}=OFF"
;; ;;
--no-*) -no-*|--no-*)
VAR=`echo $i | sed 's,^--no-\(.*\),\1,'` VAR=`echo $i | sed -E 's/-?-no-(.*)/\1/'`
CMAKE_CMDLINE="$CMAKE_CMDLINE
-DFEATURE_${VAR}=OFF"
;;
-no-*)
VAR=`echo $i | sed 's,^-no-\(.*\),\1,'`
CMAKE_CMDLINE="$CMAKE_CMDLINE CMAKE_CMDLINE="$CMAKE_CMDLINE
-DFEATURE_${VAR}=OFF" -DFEATURE_${VAR}=OFF"
;; ;;
@ -179,12 +174,12 @@ $i"
CMAKE_CMDLINE="$CMAKE_CMDLINE CMAKE_CMDLINE="$CMAKE_CMDLINE
-DFEATURE_system_${VAR}=OFF" -DFEATURE_system_${VAR}=OFF"
;; ;;
--sanitize=*) -sanitize=*|--sanitize=*)
VAR=`echo $i | sed 's,^--sanitize=\(.*\),\1,'` VAR=`echo $i | sed -E 's/-?-sanitize=(.*)/\1/'`
CMAKE_CMDLINE="$CMAKE_CMDLINE CMAKE_CMDLINE="$CMAKE_CMDLINE
-DECM_ENABLE_SANITIZERS=${VAR}" -DECM_ENABLE_SANITIZERS=${VAR}"
;; ;;
--ccache) -ccache|--ccache)
CMAKE_CMDLINE="$CMAKE_CMDLINE CMAKE_CMDLINE="$CMAKE_CMDLINE
-DQT_USE_CCACHE=ON" -DQT_USE_CCACHE=ON"
;; ;;