CMake / vc2010:
authorThomas Dinges <blender@dingto.org>
Mon, 17 Jun 2013 18:00:38 +0000 (18:00 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 17 Jun 2013 18:00:38 +0000 (18:00 +0000)
* Remove vc2010 support from cmake.

There is some "if(MSVC10)" left in extern - ceres, but will leave that for Sergey. :)

CMakeLists.txt
build_files/cmake/macros.cmake

index 39b75d9a32b46d95af316474542b41c859ac05b5..b7957badcd9665b851dd060f82d8df76ddce73fb 100644 (file)
@@ -1199,12 +1199,7 @@ elseif(WIN32)
                endif()
 
                if(WITH_PYTHON)
-                       # normally cached but not since we include them with blender
-                       if(MSVC10)
-                               set(PYTHON_VERSION 3.3) # CACHE STRING)
-                       else()
-                               set(PYTHON_VERSION 3.3) # CACHE STRING)
-                       endif()
+                       set(PYTHON_VERSION 3.3) # CACHE STRING)
 
                        set_lib_path(PYTHON "python")
                        string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
@@ -1228,10 +1223,6 @@ elseif(WIN32)
                                set(BOOST_LIBPATH ${BOOST}/lib)
                                set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
                                set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-1_53.lib")
-                       elseif(MSVC10)
-                               set(BOOST_LIBPATH ${BOOST}/vc2010/lib)
-                               set(BOOST_POSTFIX "vc100-mt-s-1_49.lib")
-                               set(BOOST_DEBUG_POSTFIX "vc100-mt-sgd-1_49.lib")
                        else()
                                set(BOOST_LIBPATH ${BOOST}/lib)
                                set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2084,13 +2075,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 endif()
 
-# MSVC2010 fails to links C++ libs right
-if(MSVC10)
-       if(WITH_OPENCOLLADA)
-               message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
-       endif()
-endif()
-
 # ensure python header is found since detection can fail, this could happen
 # with _any_ library but since we used a fixed python version this tends to
 # be most problematic.
index 2b5cfbc31ccb542e9dfb5e396e8261088d43836b..9f874581301a609b46ed2760bfe8f52490e69a4c 100644 (file)
@@ -754,12 +754,7 @@ endfunction()
 macro(set_lib_path
                lvar
                lproj)
-
-       if(MSVC10)
-               set(${lvar} ${LIBDIR}/${lproj}/vc2010)
-       else()
                set(${lvar} ${LIBDIR}/${lproj})
-       endif()
 endmacro()