osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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:
Jörg Mayer 2012-08-19 00:14:14 +00:00
parent 5e17f4606f
commit 4546cfeab5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -43,7 +43,7 @@ if(NOT PROJECT_VERSION)
VERSIONLINE
REGEX "\\(wireshark, .*\\)"
)
string(REGEX REPLACE ".*\\(wireshark, (.*)\\).*"
string(REGEX REPLACE ".*\\(wireshark, ([^,)]*).*"
"\\1"
PROJECT_VERSION
${VERSIONLINE}