diff options
author | Dimitrios Apostolou <jimis@qt.io> | 2020-06-24 23:05:04 +0200 |
---|---|---|
committer | Dimitrios Apostolou <jimis@qt.io> | 2020-06-27 02:58:24 +0200 |
commit | 33714b6c022183ca4bd98b7158d072b3892d4d32 (patch) | |
tree | ca25e9f6b2999e0fac6961d6f6bbc457f55371a4 /configure | |
parent | 52a7d2e3a3275e9902da8591a8e8741b4b8ae9e9 (diff) | |
download | qtbase-33714b6c022183ca4bd98b7158d072b3892d4d32.tar.gz |
Adjust configure -cmake to accept both single and double dash arguments
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>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 23 |
1 files changed, 9 insertions, 14 deletions
@@ -149,23 +149,18 @@ $i" CMAKE_CMDLINE="$CMAKE_CMDLINE -DQT_NO_MAKE_${arg_capitalized}=ON" ;; - -feature-*) - VAR=`echo $i | sed 's,^-feature-\(.*\),\1,'` + -feature-*|--feature-*) + VAR=`echo $i | sed -E 's/-?-feature-(.*)/\1/'` CMAKE_CMDLINE="$CMAKE_CMDLINE -DQT_FEATURE_${VAR}=ON" ;; - -no-feature-*) - VAR=`echo $i | sed 's,^-no-feature-\(.*\),\1,'` + -no-feature-*|--no-feature-*) + VAR=`echo $i | sed -E 's/-?-no-feature-(.*)/\1/'` CMAKE_CMDLINE="$CMAKE_CMDLINE -DQT_FEATURE_${VAR}=OFF" ;; - --no-*) - VAR=`echo $i | sed 's,^--no-\(.*\),\1,'` - CMAKE_CMDLINE="$CMAKE_CMDLINE --DFEATURE_${VAR}=OFF" - ;; - -no-*) - VAR=`echo $i | sed 's,^-no-\(.*\),\1,'` + -no-*|--no-*) + VAR=`echo $i | sed -E 's/-?-no-(.*)/\1/'` CMAKE_CMDLINE="$CMAKE_CMDLINE -DFEATURE_${VAR}=OFF" ;; @@ -179,12 +174,12 @@ $i" CMAKE_CMDLINE="$CMAKE_CMDLINE -DFEATURE_system_${VAR}=OFF" ;; - --sanitize=*) - VAR=`echo $i | sed 's,^--sanitize=\(.*\),\1,'` + -sanitize=*|--sanitize=*) + VAR=`echo $i | sed -E 's/-?-sanitize=(.*)/\1/'` CMAKE_CMDLINE="$CMAKE_CMDLINE -DECM_ENABLE_SANITIZERS=${VAR}" ;; - --ccache) + -ccache|--ccache) CMAKE_CMDLINE="$CMAKE_CMDLINE -DQT_USE_CCACHE=ON" ;; |