[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 56c91aa6143bfcd2a29ca86bcdd95625e36c4786
Merge: 6505577f5dae4f6c3b74f974413c72b7cac9854a 101156a341f75f20dd3c5627bc570a00e2c53e82
Author: Denis Barbier <bouzim at gmail.com>
Date:   Fri Jan 20 11:42:58 2012 -0800

    Merge pull request #225 from tpaviot/review/fix-tbb-debug
    
    Fix TBB support in Debug mode

diff --combined adm/cmake/TKernel/CMakeLists.txt
index 730a8e0,9e49093..893656b
--- a/adm/cmake/TKernel/CMakeLists.txt
+++ b/adm/cmake/TKernel/CMakeLists.txt
@@@ -1,7 -1,6 +1,7 @@@
  SET(TOOLKIT TKernel)
  
  SET(TOOLKIT_MODULES
 +	StdFail
  	FSD
  	MMgt
  	OSD
@@@ -10,6 -9,7 +10,6 @@@
  	Resource
  	SortTools
  	Standard
 -	StdFail
  	Storage
  	TColStd
  	TCollection
@@@ -47,8 -47,12 +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