forked from osmocom/wireshark
Commit 44474 added some arguments to the ac_init macro that broke
extraction of the wireshark version for cmake. Now the version part is either terminated by ")" (old) or "," (added). It looks like .*? does not exist for non-greedy matches in cmake regex. svn path=/trunk/; revision=44570
This commit is contained in:
parent
5e17f4606f
commit
4546cfeab5
|
@ -43,7 +43,7 @@ if(NOT PROJECT_VERSION)
|
||||||
VERSIONLINE
|
VERSIONLINE
|
||||||
REGEX "\\(wireshark, .*\\)"
|
REGEX "\\(wireshark, .*\\)"
|
||||||
)
|
)
|
||||||
string(REGEX REPLACE ".*\\(wireshark, (.*)\\).*"
|
string(REGEX REPLACE ".*\\(wireshark, ([^,)]*).*"
|
||||||
"\\1"
|
"\\1"
|
||||||
PROJECT_VERSION
|
PROJECT_VERSION
|
||||||
${VERSIONLINE}
|
${VERSIONLINE}
|
||||||
|
|
Loading…
Reference in New Issue