diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-10 21:29:57 +0000 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-01-11 20:22:32 +0000 |
| commit | 528a8572582116a93e660ca93cdee36809b13b96 (patch) | |
| tree | 250159b9a9000773d870b10bfa65726d9ed04e13 /cmakeconfig.h.in | |
| parent | 7d004dc887bcecb404241604242004edb6f6ceaa (diff) | |
Fix CMake generation and use of Windows .rc files
CMake now generates local copies of .rc files for all the Windows
components and uses the files in the build of the components.
The .rc.in files that include an icon were modified to allow the icon
path to be set by CMake. The path is removed for nmake builds.
Updated build architecture detection, required for wireshark.manifest.in
Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8
Reviewed-on: https://code.wireshark.org/review/6482
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'cmakeconfig.h.in')
| -rw-r--r-- | cmakeconfig.h.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index f90a561a51..73699befdb 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -5,8 +5,10 @@ /* Name of package */ #define PACKAGE "wireshark" +#define VERSION_EXTRA "$ENV{WIRESHARK_VERSION_EXTRA}" + /* Version number of package */ -#define VERSION "${CPACK_PACKAGE_VERSION}" +#define VERSION "${CPACK_PACKAGE_VERSION}${VERSION_EXTRA}" #define VERSION_MAJOR ${PROJECT_MAJOR_VERSION} #define VERSION_MINOR ${PROJECT_MINOR_VERSION} #define VERSION_MICRO ${PROJECT_PATCH_VERSION} |