|
@@ -60,6 +60,21 @@ if(MSVC11)
|
|
|
message(WARNING "Could not find msvcp110.dll, msvcr110.dll")
|
|
message(WARNING "Could not find msvcp110.dll, msvcr110.dll")
|
|
|
endif()
|
|
endif()
|
|
|
endif()
|
|
endif()
|
|
|
|
|
+elseif(MSVC12)
|
|
|
|
|
+ set(VS120COMNTOOLS "$ENV{VS120COMNTOOLS}")
|
|
|
|
|
+ if(${VS120COMNTOOLS} STREQUAL "")
|
|
|
|
|
+ message(WARNING "Environment variable VS120COMNTOOLS not defined. Is VS12 properly installed?")
|
|
|
|
|
+ else()
|
|
|
|
|
+ get_filename_component(VS120_REDIST_DIR ${VS120COMNTOOLS}/../../VC/redist/${MEGA_ARCH}/Microsoft.VC120.CRT ABSOLUTE)
|
|
|
|
|
+ set(MSVCP120_DLL ${VS120_REDIST_DIR}/msvcp120.dll)
|
|
|
|
|
+ set(MSVCR120_DLL ${VS120_REDIST_DIR}/msvcr120.dll)
|
|
|
|
|
+ if(EXISTS ${MSVCP120_DLL} AND EXISTS ${MSVCR120_DLL})
|
|
|
|
|
+ message(STATUS "Found msvcp120.dll, msvcr120.dll")
|
|
|
|
|
+ set(MEGA_MSVC_DLLS ${MSVCP120_DLL} ${MSVCR120_DLL})
|
|
|
|
|
+ else()
|
|
|
|
|
+ message(WARNING "Could not find msvcp120.dll, msvcr120.dll")
|
|
|
|
|
+ endif()
|
|
|
|
|
+ endif()
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
set(MEGA_ZLIB_VER "1.2.8")
|
|
set(MEGA_ZLIB_VER "1.2.8")
|
rude