Merge topic 'FindwxWidgets-msvc-x64'

870f91e FindwxWidgets: Look in x64 directories for MSVC (#14393)
2013-10-07 15:42:59 -04:00 · 2013-10-07 15:42:59 -04:00 · 7069680bad
parent 31e6ee502e 870f91e389
commit 7069680bad
1 changed files with 2 additions and 0 deletions
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@ -475,6 +475,8 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
    # settings.
    if(MINGW)
      set(WX_LIB_DIR_PREFIX gcc)
+    elseif(CMAKE_CL_64)
+      set(WX_LIB_DIR_PREFIX vc_x64)
    else()
      set(WX_LIB_DIR_PREFIX vc)
    endif()