summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-11-10 15:56:35 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2021-11-10 19:21:40 +0100
commita3d8a359f17e35b7485770ac9a3a731900749276 (patch)
treec0d1e579735c949925eaad2c28e2c6bd9f36ede8 /cmake
parent2d7900e2b1bf1eba3ade5241eaf21f913845cd4a (diff)
configure: Fix --foo=bar arguments
This amends commit c5409964b0c627b25131c73f95794314feb51b5d. When detecting a variable assignment, we must ignore arguments that start with a dash. Otherwise, arguments like --prefix=~/Qt are ignored. Change-Id: I3b143113b94ca0d8af92679c1f567fbcec298349 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtProcessConfigureArgs.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake
index 038905ece7..3c730d9444 100644
--- a/cmake/QtProcessConfigureArgs.cmake
+++ b/cmake/QtProcessConfigureArgs.cmake
@@ -564,7 +564,7 @@ while(1)
endif()
# Handle variable assignments
- if(arg MATCHES "^([a-zA-Z0-9_-]+)=(.*)")
+ if(arg MATCHES "^([a-zA-Z0-9_][a-zA-Z0-9_-]*)=(.*)")
list(APPEND cmake_var_assignments "${arg}")
continue()
endif()