diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-02-09 13:59:15 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-02-10 07:39:42 +0000 |
| commit | 78b7da77164298343ad92de5b9dfef2f7d46b7d6 (patch) | |
| tree | 524692897c8b35be5843eee523f23ead154e0423 | |
| parent | 0b649a09100813151555308d6ccdbd18ec43accd (diff) | |
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>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | image/wireshark.exe.manifest.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 081e9a6b9d..1aaaaacc34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/image/wireshark.exe.manifest.in b/image/wireshark.exe.manifest.in index 1a8e783d0a..e0b946417a 100644 --- a/image/wireshark.exe.manifest.in +++ b/image/wireshark.exe.manifest.in @@ -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="*" /> |