]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
Cmakization of MED.
authorageay <ageay>
Thu, 22 Mar 2012 09:45:24 +0000 (09:45 +0000)
committerageay <ageay>
Thu, 22 Mar 2012 09:45:24 +0000 (09:45 +0000)
salome_adm/cmake_files/FindBOOST.cmake

index 52cc6bcdb60c4b5a91d0bf5e436d18406e9a4066..8593edf3cd49c7bb9006d8ef3b270f314c29da52 100644 (file)
@@ -82,7 +82,8 @@ IF(BOOST_STATUS)
   FIND_PATH(BOOST_INCLUDE_DIR ${BOOST_INCLUDE_TO_FIND} PATHS ${BOOST_INCLUDE_PATHS} ${BOOST_FIND_PATHS_OPTION})
   IF(BOOST_INCLUDE_DIR)
     IF(BOOST_ROOT_USER)
-      SET(BOOST_CPPFLAGS -I${BOOST_INCLUDE_DIR})
+      SET(BOOST_CPPFLAGS -I${BOOST_INCLUDE_DIR})# to be removed
+      SET(BOOST_INCLUDES_DIR ${BOOST_INCLUDE_DIR})
     ENDIF(BOOST_ROOT_USER)
     MESSAGE(STATUS "${BOOST_INCLUDE_TO_FIND} found in ${BOOST_INCLUDE_DIR}")
   ELSE(BOOST_INCLUDE_DIR)
@@ -151,9 +152,11 @@ ENDIF(BOOST_STATUS)
 
 IF(BOOST_STATUS)
   IF(WINDOWS)
-    SET(BOOST_CPPFLAGS ${BOOST_CPPFLAGS} -DBOOST_DISABLE_ASSERTS)
+    SET(BOOST_CPPFLAGS ${BOOST_CPPFLAGS} -DBOOST_DISABLE_ASSERTS)# to be removed
+    SET(BOOST_FLAGS -DBOOST_DISABLE_ASSERTS)
     IF(BOOST_ENABLE_DLL)
-      SET(BOOST_CPPFLAGS ${BOOST_CPPFLAGS} -DBOOST_ALL_DYN_LINK)
+      SET(BOOST_CPPFLAGS ${BOOST_CPPFLAGS} -DBOOST_ALL_DYN_LINK)# to be removed
+      SET(BOOST_FLAGS -DBOOST_ALL_DYN_LINK)
     ENDIF(BOOST_ENABLE_DLL)  
   ENDIF(WINDOWS)
 ELSE(BOOST_STATUS)