diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-04 13:07:50 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-04 21:09:13 +0000 |
| commit | 40d06bd6ea1d6a00f0306610f0ec415eb0aa245b (patch) | |
| tree | 1e09c6542da2c9a853bc1c46c7021fac2ee5e0a3 /make-version.pl | |
| parent | 52b4059b1159924b3ee2b6b771c519a14bee56dd (diff) | |
Don't clobber PROJECT_VERSION_EXTENSION.
PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake.
Try to preserve it if it's set.
Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59
Reviewed-on: https://code.wireshark.org/review/6957
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'make-version.pl')
| -rwxr-xr-x | make-version.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/make-version.pl b/make-version.pl index 61eee31039..d53eeb8245 100755 --- a/make-version.pl +++ b/make-version.pl @@ -390,6 +390,9 @@ sub update_cmakelists_txt my $contents = ""; my $version = ""; my $filepath = "$srcdir/CMakeLists.txt"; + my $cmake_package_string = "\$ENV{WIRESHARK_VERSION_EXTRA}"; + + if ($package_string ne "") { $cmake_package_string = $package_string; } return if (!$set_version && $package_string eq ""); @@ -402,7 +405,7 @@ sub update_cmakelists_txt } elsif ($line =~ /^set *\( *PROJECT_PATCH_VERSION .*([\r\n]+)$/) { $line = sprintf("set(PROJECT_PATCH_VERSION %d)$1", $version_pref{"version_micro"}); } elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION.*([\r\n]+)$/) { - $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $package_string); + $line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $cmake_package_string); } $contents .= $line } |