diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-04-30 11:35:57 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-04-30 20:28:31 +0000 |
| commit | fac11078c3b5ace9b84c1058fb44714339f91190 (patch) | |
| tree | f54194814f239bcbf469aaf451f6ab53819813f0 /CMakeLists.txt | |
| parent | d0e34312b8f401d10f35f49710cbabbd96f59c38 (diff) | |
CMake: Always set PROCESSOR_ARCHITECTURE on Windows.
An undefined or invalid PROCESSOR_ARCHITECTURE will produce an invalid
wireshark.exe.manifest. Make sure it's always set.
Change-Id: I1b33f7bd5e964f05344919d1f11d88c14104c0ce
Reviewed-on: https://code.wireshark.org/review/8253
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4aa0ae2c54..e05394b3e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,14 +62,18 @@ if(WIN32) if("${CMAKE_GENERATOR}" MATCHES "Win64") set(WIRESHARK_TARGET_PLATFORM win64) - set(PROCESSOR_ARCHITECTURE amd64) elseif("${CMAKE_GENERATOR}" MATCHES "Visual Studio") set(WIRESHARK_TARGET_PLATFORM win32) - set(PROCESSOR_ARCHITECTURE x86) else() set(WIRESHARK_TARGET_PLATFORM $ENV{WIRESHARK_TARGET_PLATFORM}) endif() + if ("${WIRESHARK_TARGET_PLATFORM}" MATCHES "win64") + set(PROCESSOR_ARCHITECTURE amd64) + else() + set(PROCESSOR_ARCHITECTURE x86) + endif() + # Sanity check if(DEFINED ENV{PLATFORM}) string(TOLOWER $ENV{PLATFORM} _vs_platform) |