Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake / vc2010:

Browse Source 
* Remove vc2010 support from cmake. 

There is some "if(MSVC10)" left in extern - ceres, but will leave that for Sergey. :)
This commit is contained in:
Thomas Dinges
2013-06-17 18:00:38 +00:00
parent 03b6653618
commit 91d7df12ee
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -1199,12 +1199,7 @@ elseif(WIN32)
endif() endif()
if(WITH_PYTHON) if(WITH_PYTHON)
# normally cached but not since we include them with blender
if(MSVC10)
set(PYTHON_VERSION 3.3) # CACHE STRING) set(PYTHON_VERSION 3.3) # CACHE STRING)
else()
set(PYTHON_VERSION 3.3) # CACHE STRING)
endif()
set_lib_path(PYTHON "python") set_lib_path(PYTHON "python")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION}) string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
@@ -1228,10 +1223,6 @@ elseif(WIN32)
set(BOOST_LIBPATH ${BOOST}/lib) set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc110-mt-s-1_53.lib") set(BOOST_POSTFIX "vc110-mt-s-1_53.lib")
set(BOOST_DEBUG_POSTFIX "vc110-mt-sgd-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() else()
set(BOOST_LIBPATH ${BOOST}/lib) set(BOOST_LIBPATH ${BOOST}/lib)
set(BOOST_POSTFIX "vc90-mt-s-1_49.lib") set(BOOST_POSTFIX "vc90-mt-s-1_49.lib")
@@ -2084,13 +2075,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
endif() 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 # 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 # with _any_ library but since we used a fixed python version this tends to
# be most problematic. # be most problematic.

5
build_files/cmake/macros.cmake
View File

@@ -754,12 +754,7 @@ endfunction()
macro(set_lib_path macro(set_lib_path
lvar lvar
lproj) lproj)
if(MSVC10)
set(${lvar} ${LIBDIR}/${lproj}/vc2010)
else()
set(${lvar} ${LIBDIR}/${lproj}) set(${lvar} ${LIBDIR}/${lproj})
endif()
endmacro() endmacro()