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

Merge topic 'FindwxWidgets-library-path'

Browse Source 
20d7da52 FindwxWidgets: Add VS-versioned library directory prefixes
4ef8a205 FindwxWidgets: Add version 3.1.0
This commit is contained in:
Brad King 2016-08-26 09:45:34 -04:00 committed by CMake Topic Stage
commit 135c785549
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Modules/FindwxWidgets.cmake
View File

@ -452,6 +452,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
D:/ D:/
ENV ProgramFiles ENV ProgramFiles
PATH_SUFFIXES PATH_SUFFIXES
wxWidgets-3.1.0
wxWidgets-3.0.2 wxWidgets-3.0.2
wxWidgets-3.0.1 wxWidgets-3.0.1
wxWidgets-3.0.0 wxWidgets-3.0.0
@ -503,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