diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-24 21:09:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-25 15:26:34 (GMT) |
| commit | 20d7da5276704864569fb08259278a08c5f9e725 (patch) | |
| tree | f7fa8e06522afe807a966d51b96578aa11290b34 /Modules/FindwxWidgets.cmake | |
| parent | 4ef8a205edf66b652418aa5491436d26fd806175 (diff) | |
| download | CMake-20d7da5276704864569fb08259278a08c5f9e725.zip CMake-20d7da5276704864569fb08259278a08c5f9e725.tar.gz CMake-20d7da5276704864569fb08259278a08c5f9e725.tar.bz2 | |
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)
Diffstat (limited to 'Modules/FindwxWidgets.cmake')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 30b8e21..47a70f5 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -504,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 |