Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-05-06 02:03:45 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-05-06 02:03:45 +0400
commit678b3cbb4f53b10c08c70fbdaa0a9bc57ebd7dac (patch)
tree28443b3bcd84d4a23bd8a188df2ab2165a0ecc80 /CMakeLists.txt
parent4c47a71e558bb00dde1891e0c3b903ac078d5e91 (diff)
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.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a6aced3c20..dafcf15141c 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)