[Bf-blender-cvs] [bd68a25] master: cmake fix full debug builds on msvc

Martijn Berger noreply at git.blender.org
Thu Mar 31 08:14:58 CEST 2016


Commit: bd68a25505ac6cb570f695edb7567a472d4ad208
Author: Martijn Berger
Date:   Thu Mar 31 08:12:41 2016 +0200
Branches: master
https://developer.blender.org/rBbd68a25505ac6cb570f695edb7567a472d4ad208

cmake fix full debug builds on msvc

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a17516..4a03e8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1443,18 +1443,11 @@ elseif(WIN32)
 				set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
 				set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 				set(OPENEXR_LIBRARIES
-					optimized
-					${OPENEXR_LIBPATH}/Iex-2_2.lib
-					${OPENEXR_LIBPATH}/Half.lib
-					${OPENEXR_LIBPATH}/IlmImf-2_2.lib
-					${OPENEXR_LIBPATH}/Imath-2_2.lib
-					${OPENEXR_LIBPATH}/IlmThread-2_2.lib
-					debug
-					${OPENEXR_LIBPATH}/Iex-2_2_d.lib
-					${OPENEXR_LIBPATH}/Half_d.lib
-					${OPENEXR_LIBPATH}/IlmImf-2_2_d.lib
-					${OPENEXR_LIBPATH}/Imath-2_2_d.lib
-					${OPENEXR_LIBPATH}/IlmThread-2_2_d.lib
+					optimized ${OPENEXR_LIBPATH}/Iex-2_2.lib debug ${OPENEXR_LIBPATH}/Iex-2_2_d.lib
+					optimized ${OPENEXR_LIBPATH}/Half.lib debug ${OPENEXR_LIBPATH}/Half_d.lib
+					optimized ${OPENEXR_LIBPATH}/IlmImf-2_2.lib debug ${OPENEXR_LIBPATH}/IlmImf-2_2_d.lib
+					optimized ${OPENEXR_LIBPATH}/Imath-2_2.lib debug ${OPENEXR_LIBPATH}/Imath-2_2_d.lib
+					optimized ${OPENEXR_LIBPATH}/IlmThread-2_2.lib debug ${OPENEXR_LIBPATH}/IlmThread-2_2_d.lib
 				)
 			endif()
 		endif()
@@ -1593,12 +1586,12 @@ elseif(WIN32)
 		endif()
 
 		if(WITH_OPENVDB)
-			set(BLOSC_LIBRARIES ${LIBDIR}/blosc/lib/libblosc.lib)
-			set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/tbb.lib)
+			set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug ${LIBDIR}/blosc/lib/libblosc_d.lib)
+			set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
 			set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
 			set(OPENVDB ${LIBDIR}/openvdb)
 			set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
-			set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
+			set(OPENVDB_LIBRARIES optimized openvdb debug openvdb_d ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
 			set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
 		endif()




More information about the Bf-blender-cvs mailing list