]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
CMake: Add Boost include dirs and definitions to KERNEL includes and definitions...
authorbarate <barate>
Thu, 12 Sep 2013 13:27:01 +0000 (13:27 +0000)
committerbarate <barate>
Thu, 12 Sep 2013 13:27:01 +0000 (13:27 +0000)
salome_adm/cmake_files/SalomeKERNELConfig.cmake.in

index c2b0bc658432faa4373e44e5675e0998f7cc1f5c..cd5761cb56742c74995a555a56d247bac2f2dff5 100644 (file)
@@ -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@")