diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindWSWinLibs.cmake | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmake/modules/FindWSWinLibs.cmake b/cmake/modules/FindWSWinLibs.cmake index ce4bceba7f..75568d49d8 100644 --- a/cmake/modules/FindWSWinLibs.cmake +++ b/cmake/modules/FindWSWinLibs.cmake @@ -19,11 +19,18 @@ function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR ) set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" ) endif() endif() + file( GLOB _SUBDIR "${_PROJECT_LIB_DIR}/*" ) + # We might be able to use $ENV{VSCMD_ARG_TGT_ARCH} here. + set (_vcpkg_arch x64) + if(WIRESHARK_TARGET_PLATFORM MATCHES "win32") + set (_vcpkg_arch x86) + endif() + foreach( _DIR ${_SUBDIR} ) if( IS_DIRECTORY ${_DIR} ) if( "${_DIR}" MATCHES ".*/${_WS_LIB_SEARCH_PATH}" ) - set(_vcpkg_dir "${_DIR}/installed/$ENV{PLATFORM}-windows") + set(_vcpkg_dir "${_DIR}/installed/${_vcpkg_arch}-windows") if( IS_DIRECTORY "${_vcpkg_dir}") set( ${_LIB_HINT_VAR} ${_vcpkg_dir} PARENT_SCOPE ) else() |