[Bf-blender-cvs] [678b3cb] master: Proper fix for CMake files

[Sergey Sharybin]

Commit: 678b3cbb4f53b10c08c70fbdaa0a9bc57ebd7dac
Author: Sergey Sharybin
Date:   Tue May 6 04:03:45 2014 +0600
https://developer.blender.org/rB678b3cbb4f53b10c08c70fbdaa0a9bc57ebd7dac

Proper fix for CMake files

next time you're deprecating some platform, compiler, feature just either
mail in the ML telling about this or if you're not that lazy poke developers
online whether then can spot issues quick.

Or be ready to pick up stuff being done by the developers your change gives
headache to.

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a6aced..dafcf15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -958,11 +958,6 @@ elseif(WIN32)
 
 	if(MSVC)
 
-		# drop support for older MSVC
-		if(MSVC_VERSION VERSION_LESS 1800 AND (NOT CMAKE_CL_64))
-			message(FATAL_ERROR "MSVC versions older than 2013 are no longer supported")
-		endif()
-
 		set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi)
 
 		# MSVC11 SDL is not hard linked to dxguid.lib
@@ -1094,6 +1089,9 @@ elseif(WIN32)
 			set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 		endif()
 
+		if(MSVC90)
+			set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
+		endif()
 		find_package(jpeg REQUIRED)
 
 		set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)