diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2015-12-10 13:49:53 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2015-12-10 13:57:13 +0300 |
| commit | ffc750a4fafc6fe4e6fb556506becaa0e1ce8c9a (patch) | |
| tree | 9b367e391bd77659841714c40a80f6e1a2c0654a /CMakeLists.txt | |
| parent | 5f0cf67882062bc7f9d1f99d25a191330fa9443e (diff) | |
Begin to add some MSVC 2015 support
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1cf5d1c4620..354e4adb0d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1291,13 +1291,22 @@ elseif(WIN32) set(PLATFORM_LINKFLAGS_DEBUG "/IGNORE:4099 /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib") if(NOT DEFINED LIBDIR) + # Setup 64bit and 64bit windows systems if(CMAKE_CL_64) message(STATUS "64 bit compiler detected.") - set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64_vc12) + set(LIBDIR_BASE "win64") else() message(STATUS "32 bit compiler detected.") - set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows_vc12) + set(LIBDIR_BASE "windows") + endif() + + if(MSVC_VERSION EQUAL 1900) + message(STATUS "Visual Studio 2015 detected.") + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14) + else() + message(STATUS "Visual Studio 2013 detected.") + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc12) endif() else() message(STATUS using LIBDIR ${LIBDIR}) |