diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-06-06 17:54:57 -0700 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2023-06-10 21:41:27 +0000 |
| commit | 049a89b2ce3c1035a7a73c85654230ac1ee11e70 (patch) | |
| tree | eac82e6dce13fd6f9e52f5e6c6ac0a44e1328fc9 /cmake/modules | |
| parent | 46f5f7a31f4fde6ba34ace8f0428504610b4aeb6 (diff) | |
CMake+Windows: Use "x64" instead of "win64"
Use "x64" to refer to "Windows running on 64-bit Intel processors". Get
rid of WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE in favor of
WIRESHARK_TARGET_PLATFORM because the latter is shorter.
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindWSWinLibs.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindWinSparkle.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake index 3778f4b8dd..71297e6463 100644 --- a/cmake/modules/FindWSWinLibs.cmake +++ b/cmake/modules/FindWSWinLibs.cmake @@ -26,7 +26,7 @@ function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR ) foreach( _DIR ${_SUBDIR} ) if( IS_DIRECTORY ${_DIR} ) if( "${_DIR}" MATCHES ".*/${_WS_LIB_SEARCH_PATH}" ) - set(_vcpkg_dir "${_DIR}/installed/${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}-windows") + set(_vcpkg_dir "${_DIR}/installed/${WIRESHARK_TARGET_PLATFORM}-windows") if( IS_DIRECTORY "${_vcpkg_dir}") set( ${_LIB_HINT_VAR} ${_vcpkg_dir} PARENT_SCOPE ) else() diff --git a/cmake/modules/FindWinSparkle.cmake b/cmake/modules/FindWinSparkle.cmake index d2888911c7..7418cfb7a8 100644 --- a/cmake/modules/FindWinSparkle.cmake +++ b/cmake/modules/FindWinSparkle.cmake @@ -17,7 +17,7 @@ ENDIF (WINSPARKLE_INCLUDE_DIRS) INCLUDE(FindWSWinLibs) FindWSWinLibs("WinSparkle.*" "WINSPARKLE_HINTS") -set (_release_subdir "${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}/Release") +set (_release_subdir "${WIRESHARK_TARGET_PLATFORM}/Release") FIND_PATH(WINSPARKLE_INCLUDE_DIR winsparkle.h HINTS "${WINSPARKLE_HINTS}/include" ) |