osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Make PROJECT_VERSION_EXTENSION code simpler 

The intent was to allow all sorts of overrides but, ugly.

I don't think we need $cmake_package_string either, at least with
these changes.

Follow-up to 7c6e859ccf.

(And bdec712166).

Change-Id: I808b6bd3a3c64d2a67165344e8fe23e8314c27db
Reviewed-on: https://code.wireshark.org/review/15835
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2016-06-11 06:10:17 +01:00 committed by João Valverde
parent 38d39f292e
commit cee3e827eb
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -180,14 +180,10 @@ set(PROJECT_MAJOR_VERSION 2)
set(PROJECT_MINOR_VERSION 1)
set(PROJECT_PATCH_VERSION 1)
set(PROJECT_BUILD_VERSION ${GIT_REVISION})
# Updated by make-version.pl
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
if(NOT DEFINED PROJECT_VERSION_EXTENSION)
if (DEFINED ENV{WIRESHARK_VERSION_EXTRA})
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
else()
set(PROJECT_VERSION_EXTENSION "-git")
endif()
set(PROJECT_VERSION_EXTENSION "-git")
if(ENV{WIRESHARK_VERSION_EXTRA})
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
endif()
set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")

7
make-version.pl
View File

@ -405,9 +405,6 @@ 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 "");
@ -421,8 +418,8 @@ sub update_cmakelists_txt
$line = sprintf("set(PROJECT_MINOR_VERSION %d)$1", $version_pref{"version_minor"});
} 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\b.*\) *([\r\n]+)$/) {
$line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $cmake_package_string);
} elsif ($line =~ /^set *\( *PROJECT_VERSION_EXTENSION .*([\r\n]+)$/) {
$line = sprintf("set(PROJECT_VERSION_EXTENSION \"%s\")$1", $package_string);
}
$contents .= $line
}