diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-26 13:45:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-26 13:45:34 (GMT) |
| commit | 135c78554944250e9a15efe2bc60e9f8197ff2a1 (patch) | |
| tree | b5c953afd3af5ce17c38e23228d64a592846851c | |
| parent | d65584f7a3074ff9887a4e540cfdbd48a4628c22 (diff) | |
| parent | 20d7da5276704864569fb08259278a08c5f9e725 (diff) | |
| download | CMake-135c78554944250e9a15efe2bc60e9f8197ff2a1.zip CMake-135c78554944250e9a15efe2bc60e9f8197ff2a1.tar.gz CMake-135c78554944250e9a15efe2bc60e9f8197ff2a1.tar.bz2 | |
Merge topic 'FindwxWidgets-library-path'
20d7da52 FindwxWidgets: Add VS-versioned library directory prefixes
4ef8a205 FindwxWidgets: Add version 3.1.0
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 2974b9e..47a70f5 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -452,6 +452,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") D:/ ENV ProgramFiles PATH_SUFFIXES + wxWidgets-3.1.0 wxWidgets-3.0.2 wxWidgets-3.0.1 wxWidgets-3.0.0 @@ -503,10 +504,22 @@ 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() + elseif(MSVC) 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() if(BUILD_SHARED_LIBS) find_path(wxWidgets_LIB_DIR |