From 52f748d928fd178d2acc2064bee04dcf6ac555ee Mon Sep 17 00:00:00 2001 From: rude Date: Sun, 29 Sep 2013 16:46:55 +0200 Subject: [PATCH] Find dynamic runtime libraries for MSVC11. --- CMakeLists.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 63ecba97..0192eecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,24 @@ function(disable_warnings ARG_TARGET) set_target_properties(${ARG_TARGET} PROPERTIES COMPILE_FLAGS ${NEW_FLAGS}) endfunction() +# Look for dynamic runtime DLLs. +if(MSVC11) + set(VS110COMNTOOLS "$ENV{VS110COMNTOOLS}") + if(${VS110COMNTOOLS} STREQUAL "") + message(WARNING "Environment variable VS110COMNTOOLS not defined. Is VS11 properly installed?") + else() + get_filename_component(VS110_REDIST_DIR ${VS110COMNTOOLS}/../../VC/redist/${MEGA_ARCH}/Microsoft.VC110.CRT ABSOLUTE) + set(MSVCP110_DLL ${VS110_REDIST_DIR}/msvcp110.dll) + set(MSVCR110_DLL ${VS110_REDIST_DIR}/msvcr110.dll) + if(EXISTS ${MSVCP110_DLL} AND EXISTS ${MSVCR110_DLL}) + message(STATUS "Found msvcp110.dll, msvcr110.dll") + set(MEGA_MSVC_DLLS ${MSVCP110_DLL} ${MSVCR110_DLL}) + else() + message(WARNING "Could not find msvcp110.dll, msvcr110.dll") + endif() + endif() +endif() + set(MEGA_ZLIB_VER "1.2.8") set(MEGA_PHYSFS_VER "2.0.3") set(MEGA_LUA51_VER "5.1.5")