summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-07 19:42:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-07 19:42:59 (GMT)
commit7069680bad924b52d03b33b1da17f41395cfbc6e (patch)
tree338d0071f21a38bd64f9bdd3c884b871fec3964f /Modules
parent31e6ee502ea1d3897fc553030190610a9980ab4a (diff)
parent870f91e389ec5727e8bd08e9d46bfa29f7e4b77d (diff)
downloadCMake-7069680bad924b52d03b33b1da17f41395cfbc6e.zip
CMake-7069680bad924b52d03b33b1da17f41395cfbc6e.tar.gz
CMake-7069680bad924b52d03b33b1da17f41395cfbc6e.tar.bz2
Merge topic 'FindwxWidgets-msvc-x64'
870f91e FindwxWidgets: Look in x64 directories for MSVC (#14393)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindwxWidgets.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 37a894c..28c1b64 100644
--- 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()