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

CMake: Don't shadow PROCESSOR_ARCHITECTURE. 

PROCESSOR_ARCHITECTURE is a standard Windows environment variable.
Rename the CMake variable WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE.

Change-Id: I03109d45d6fb5f00742cd43085a9d33d9e5ddf1f
Reviewed-on: https://code.wireshark.org/review/25721
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Gerald Combs 2018-02-09 13:59:15 -08:00 committed by Anders Broman
parent 0b649a0910
commit 78b7da7716
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -82,9 +82,9 @@ if(WIN32)
endif()
if ("${WIRESHARK_TARGET_PLATFORM}" MATCHES "win64")
set(PROCESSOR_ARCHITECTURE amd64)
set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE amd64)
else()
set(PROCESSOR_ARCHITECTURE x86)
set(WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE x86)
endif()
# Sanity check

4
image/wireshark.exe.manifest.in
View File

@ -2,7 +2,7 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_MICRO@.0"
processorArchitecture="@PROCESSOR_ARCHITECTURE@"
processorArchitecture="@WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@"
name="WiresharkDevelopmentTeam.Wireshark"
type="win32"
/>
@ -13,7 +13,7 @@
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="@PROCESSOR_ARCHITECTURE@"
processorArchitecture="@WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@"
publicKeyToken="6595b64144ccf1df"
language="*"
/>