From: barate <barate>
Date: Thu, 12 Sep 2013 13:27:01 +0000 (+0000)
Subject: CMake: Add Boost include dirs and definitions to KERNEL includes and definitions... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=176e23cea3eceaacc35498579dc8dd8739c01f50;p=modules%2Fyacs.git

CMake: Add Boost include dirs and definitions to KERNEL includes and definitions. This is needed because an exported header in KERNEL depends on Boost.
---

diff --git a/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in b/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in
index c2b0bc658..cd5761cb5 100644
--- a/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in
+++ b/salome_adm/cmake_files/SalomeKERNELConfig.cmake.in
@@ -84,8 +84,13 @@ IF(SALOME_USE_LIBBATCH)
   SET_AND_CHECK(LIBBATCH_ROOT_DIR_EXP "@PACKAGE_LIBBATCH_ROOT_DIR@")
 ENDIF()
 
-SET_AND_CHECK(PTHREAD_ROOT_DIR_EXP  "@PACKAGE_PTHREAD_ROOT_DIR@")
+# We need to export Boost_INCLUDE_DIRS because dependent projects may use header file
+# SALOMEDSClient_definitions.hxx that depends on Boost shared pointers
 SET_AND_CHECK(BOOST_ROOT_DIR_EXP    "@PACKAGE_BOOST_ROOT_DIR@")
+SET(KERNEL_INCLUDE_DIRS "${KERNEL_INCLUDE_DIRS};@Boost_INCLUDE_DIRS@")
+SET(KERNEL_DEFINITIONS "${KERNEL_DEFINITIONS};@BOOST_DEFINITIONS@")
+
+SET_AND_CHECK(PTHREAD_ROOT_DIR_EXP  "@PACKAGE_PTHREAD_ROOT_DIR@")
 SET_AND_CHECK(HDF5_ROOT_DIR_EXP     "@PACKAGE_HDF5_ROOT_DIR@")
 SET_AND_CHECK(LIBXML2_ROOT_DIR_EXP  "@PACKAGE_LIBXML2_ROOT_DIR@")
 SET_AND_CHECK(PYTHON_ROOT_DIR_EXP   "@PACKAGE_PYTHON_ROOT_DIR@")