[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48600] trunk/blender/CMakeLists.txt: Cmake / Boost:
Thomas Dinges
blender at dingto.org
Wed Jul 4 18:39:34 CEST 2012
Revision: 48600
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48600
Author: dingto
Date: 2012-07-04 16:39:34 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Cmake / Boost:
* Code cleanup
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-07-04 16:30:12 UTC (rev 48599)
+++ trunk/blender/CMakeLists.txt 2012-07-04 16:39:34 UTC (rev 48600)
@@ -990,9 +990,11 @@
set(BOOST ${LIBDIR}/boost)
set(BOOST_INCLUDE_DIR ${BOOST}/include)
if(MSVC10)
+ set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
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")
set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_49.lib")
endif()
@@ -1001,11 +1003,6 @@
optimized libboost_regex-${BOOST_POSTFIX} optimized libboost_system-${BOOST_POSTFIX} optimized libboost_thread-${BOOST_POSTFIX}
debug libboost_date_time-${BOOST_DEBUG_POSTFIX} debug libboost_filesystem-${BOOST_DEBUG_POSTFIX}
debug libboost_regex-${BOOST_DEBUG_POSTFIX} debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX})
- if(MSVC10)
- set(BOOST_LIBPATH ${BOOST}/lib/vc_10)
- else()
- set(BOOST_LIBPATH ${BOOST}/lib)
- endif()
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
endif()
More information about the Bf-blender-cvs
mailing list