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>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 081e9a6b9d4ea765ee032242158b46ab9a534d65..1aaaaacc3496a37fa275436f41d785f46965bb33 100644 (file)
--- 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 1a8e783d0aa1b3c92ae8e9e41cd57e89d9051c96..e0b946417ae605659e8bfaa8a1ed6097a71fd1be 100644 (file)
--- 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="*"
       />