summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMarius Luca <marius@dreamer-ge.com>2013-09-09 22:32:00 (GMT)
committerBrad King <brad.king@kitware.com>2013-09-10 12:41:13 (GMT)
commit870f91e389ec5727e8bd08e9d46bfa29f7e4b77d (patch)
tree1cca09eafc3e9483261c7154aecea9cc0f2722ab /Modules
parent1e11708a560f0d06867fb3f2a83149b224ef44ba (diff)
downloadCMake-870f91e389ec5727e8bd08e9d46bfa29f7e4b77d.zip
CMake-870f91e389ec5727e8bd08e9d46bfa29f7e4b77d.tar.gz
CMake-870f91e389ec5727e8bd08e9d46bfa29f7e4b77d.tar.bz2
FindwxWidgets: Look in x64 directories for MSVC (#14393)
When compiling the 64 bit version of wxWidgets using nmake the library folders become vc_x64_lib and vc_x64_dll and can coexist with the win32 version.
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()