[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23

[Denis Barbier]

The following commit has been merged in the upstream branch:
commit 101156a341f75f20dd3c5627bc570a00e2c53e82
Author: Denis Barbier <bouzim at gmail.com>
Date:   Tue Jan 10 07:53:55 2012 +0100

    Fix TBB support in Debug mode
    
    It did work only on MSVC; there were linking errors when
    compiling DRAWEXE because TBB library had a wrong name.

diff --git a/adm/cmake/TKMesh/CMakeLists.txt b/adm/cmake/TKMesh/CMakeLists.txt
index 910e07c..8f54858 100644
--- a/adm/cmake/TKMesh/CMakeLists.txt
+++ b/adm/cmake/TKMesh/CMakeLists.txt
@@ -19,8 +19,12 @@ SET(TOOLKIT_DEPENDS
 IF(${PROJECT_NAME}_MULTITHREAD_LIBRARY STREQUAL "TBB" AND TBB_INCLUDE_DIR AND TBB_LIBRARY)
 	ADD_DEFINITIONS(-DHAVE_TBB)
 	SET(TOOLKIT_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIR})
-	SET(TOOLKIT_LIBS_OPTIMIZED ${TBB_LIBRARY})
-	SET(TOOLKIT_LIBS_DEBUG ${TBB_LIBRARY_DEBUG})
+	IF(CMAKE_CONFIGURATION_TYPES OR NMAKE)
+		SET(TOOLKIT_LIBS_DEBUG ${TBB_LIBRARY_DEBUG})
+		SET(TOOLKIT_LIBS_OPTIMIZED ${TBB_LIBRARY})
+	ELSE(CMAKE_CONFIGURATION_TYPES OR NMAKE)
+		SET(TOOLKIT_LIBS ${TBB_LIBRARY})
+	ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE)
 ENDIF(${PROJECT_NAME}_MULTITHREAD_LIBRARY STREQUAL "TBB" AND TBB_INCLUDE_DIR AND TBB_LIBRARY)
 IF(${PROJECT_NAME}_MULTITHREAD_LIBRARY STREQUAL "OPENMP" AND OPENMP_FOUND)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
diff --git a/adm/cmake/TKernel/CMakeLists.txt b/adm/cmake/TKernel/CMakeLists.txt
index ef77221..9e49093 100644
--- a/adm/cmake/TKernel/CMakeLists.txt
+++ b/adm/cmake/TKernel/CMakeLists.txt
@@ -47,8 +47,12 @@ ENDIF(WIN32)
 IF(${PROJECT_NAME}_TBB_MALLOC_SUPPORT AND TBB_INCLUDE_DIR AND TBB_MALLOC_LIBRARY)
 	ADD_DEFINITIONS(-DHAVE_TBB)
 	SET(TOOLKIT_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIR})
-	SET(TOOLKIT_LIBS_OPTIMIZED ${TBB_MALLOC_LIBRARY})
-	SET(TOOLKIT_LIBS_DEBUG ${TBB_MALLOC_LIBRARY_DEBUG})
+	IF(CMAKE_CONFIGURATION_TYPES OR NMAKE)
+		SET(TOOLKIT_LIBS_DEBUG ${TOOLKIT_LIBS_DEBUG} ${TBB_MALLOC_LIBRARY_DEBUG})
+		SET(TOOLKIT_LIBS_OPTIMIZED ${TOOLKIT_LIBS_OPTIMIZED} ${TBB_MALLOC_LIBRARY})
+	ELSE(CMAKE_CONFIGURATION_TYPES OR NMAKE)
+		SET(TOOLKIT_LIBS ${TOOLKIT_LIBS} ${TBB_MALLOC_LIBRARY})
+	ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE)
 ENDIF(${PROJECT_NAME}_TBB_MALLOC_SUPPORT AND TBB_INCLUDE_DIR AND TBB_MALLOC_LIBRARY)
 
 INCLUDE(../BuildToolkit.cmake)

-- 
OCE packaging