kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindwxWidgets: Add VS-versioned library directory prefixes 

Add Visual Studio version number (supported: VS2008 to VS2015) to
WX_LIB_DIR_PREFIX (old: vc / vc_x64; new: vc120 / vc120_x64).

Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
This commit is contained in:
Brad King 2016-08-24 23:09:26 +02:00
parent 4ef8a205ed
commit 20d7da5276
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/FindwxWidgets.cmake
View File

@ -504,10 +504,22 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# settings. # settings.
if(MINGW) if(MINGW)
set(WX_LIB_DIR_PREFIX gcc) set(WX_LIB_DIR_PREFIX gcc)
elseif(CMAKE_CL_64) elseif(MSVC)
set(WX_LIB_DIR_PREFIX vc_x64)
else()
set(WX_LIB_DIR_PREFIX vc) set(WX_LIB_DIR_PREFIX vc)
if(MSVC14)
set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}140)
elseif(MSVC12)
set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}120)
elseif(MSVC11)
set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}110)
elseif(MSVC10)
set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}100)
elseif(MSVC90)
set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}90)
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}_x64)
endif()
endif() endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
find_path(wxWidgets_LIB_DIR find_path(wxWidgets_LIB_DIR