SALOME_HOMARD is goog now

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c27194d5463c7ba5261de76738e092fc4fc0b4ca..0002cb18764e888373f283ba506de68afb496e16 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,12 +40,14 @@ ENDIF()
 SALOME_SETUP_VERSION(9.12.0)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
+FIND_PACKAGE(SalomeBoost REQUIRED)
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
 IF(EXISTS ${KERNEL_ROOT_DIR})
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
   KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA
+  INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
 ELSE(EXISTS ${KERNEL_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
 ENDIF(EXISTS ${KERNEL_ROOT_DIR})

diff --git a/src/FrontTrack/CMakeLists.txt b/src/FrontTrack/CMakeLists.txt
index 24f77e4a12f4756e840cec7f0f4cba90d5e3a6dd..732bab015af2d4c7ddcf9ac7f53a0e3b5498002f 100644 (file)
--- a/src/FrontTrack/CMakeLists.txt
+++ b/src/FrontTrack/CMakeLists.txt
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${OpenCASCADE_DEFINITIONS}
+  ${BOOST_DEFINITIONS}
 )
 
 IF(FRONTTRACK_USE_TBB)
@@ -44,6 +45,7 @@ SET(_link_LIBRARIES
   ${GEOM_XAO}
   ${MEDCoupling_medloader}
   ${TBB_LIBS}
+  ${Boost_LIBRARIES}
 )
 
 # --- headers ---

diff --git a/src/HOMARD/HOMARD_Boundary.cxx b/src/HOMARD/HOMARD_Boundary.cxx
index 57230415d620e7d5ada1adf45d1c71d8cdaa7681..eb431c4b6be9f82875918a648276c707d08a9118 100644 (file)
--- a/src/HOMARD/HOMARD_Boundary.cxx
+++ b/src/HOMARD/HOMARD_Boundary.cxx
@@ -34,7 +34,6 @@
 #include "HOMARD_Boundary.hxx"
 #include "HOMARD.hxx"
 #include "utilities.h"
-#include <sstream>
 
 //=============================================================================
 /*!

diff --git a/src/HOMARD/HOMARD_Cas.cxx b/src/HOMARD/HOMARD_Cas.cxx
index 430506a96e484ac03d2ecc2385a3dd53aa9d696b..4b67d08cda5b76902acdf9aee98ece1c6a66db3a 100644 (file)
--- a/src/HOMARD/HOMARD_Cas.cxx
+++ b/src/HOMARD/HOMARD_Cas.cxx
@@ -35,7 +35,6 @@
 #include "utilities.h"
 #include "HOMARD.hxx"
 #include <iostream>
-#include <sstream>
 #include <sys/stat.h>
 
 #ifndef WIN32

diff --git a/src/HOMARD/HOMARD_Hypothesis.cxx b/src/HOMARD/HOMARD_Hypothesis.cxx
index b2dffe98b915ab09c160f1656c837cbfef2ecee7..57dcb3e3450bb90e7ce2147ab86925a3d422402b 100644 (file)
--- a/src/HOMARD/HOMARD_Hypothesis.cxx
+++ b/src/HOMARD/HOMARD_Hypothesis.cxx
@@ -34,7 +34,6 @@
 #include "HOMARD_Hypothesis.hxx"
 #include "HOMARD.hxx"
 #include "utilities.h"
-#include <sstream>
 
 //=============================================================================
 /*!

diff --git a/src/HOMARD/HOMARD_Iteration.cxx b/src/HOMARD/HOMARD_Iteration.cxx
index f1863ff1f55dd6a999d2743013d9002860720130..0101bd91a0e2bf5acb07c5524dbf8822305e32bd 100644 (file)
--- a/src/HOMARD/HOMARD_Iteration.cxx
+++ b/src/HOMARD/HOMARD_Iteration.cxx
@@ -34,7 +34,6 @@
 #include "HOMARD_Iteration.hxx"
 #include "HOMARD.hxx"
 #include "utilities.h"
-#include <sstream>
 
 //=============================================================================
 /*!

diff --git a/src/HOMARD/HOMARD_YACS.cxx b/src/HOMARD/HOMARD_YACS.cxx
index dae4f37be8e534317c5ae8e652b2beee9993e07d..a124cb1e1fb5e4d8ac7c341985c791436c1b10a4 100644 (file)
--- a/src/HOMARD/HOMARD_YACS.cxx
+++ b/src/HOMARD/HOMARD_YACS.cxx
@@ -33,7 +33,6 @@
 
 #include "HOMARD_YACS.hxx"
 #include "utilities.h"
-#include <sstream>
 
 //=============================================================================
 /*!

diff --git a/src/HOMARD/HOMARD_Zone.cxx b/src/HOMARD/HOMARD_Zone.cxx
index 5dfac337e8e678bcc860c6bd89e133707402ba0e..556c770c552858aab729fa9bcaa6dea579fd4b9a 100644 (file)
--- a/src/HOMARD/HOMARD_Zone.cxx
+++ b/src/HOMARD/HOMARD_Zone.cxx
@@ -34,7 +34,6 @@
 #include "HOMARD_Zone.hxx"
 #include "HOMARD.hxx"
 #include "utilities.h"
-#include <sstream>
 
 //=============================================================================
 /*!

diff --git a/src/HOMARD_I/CMakeLists.txt b/src/HOMARD_I/CMakeLists.txt
index 09b0880bc4bb63f146cf4ed5604f5d7c6419e493..8a2355aaf7846bd01c1ed266b45b1ce5ae2ea260 100644 (file)
--- a/src/HOMARD_I/CMakeLists.txt
+++ b/src/HOMARD_I/CMakeLists.txt
@@ -37,6 +37,7 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
+  ${BOOST_DEFINITIONS}
 )
 
 # libraries to link to
@@ -54,6 +55,7 @@ SET(_link_LIBRARIES
   FrontTrack
   SalomeIDLHOMARD
   HOMARDImpl
+  ${Boost_LIBRARIES}
 )
 
 # --- headers ---

diff --git a/src/tool/CMakeLists.txt b/src/tool/CMakeLists.txt
index 675db2f042ca0f4ed2de23f22e00a8dd4e16030c..24fa6c3e1106cd8b101807a0ccd6fc6cb5d5ac35 100644 (file)
--- a/src/tool/CMakeLists.txt
+++ b/src/tool/CMakeLists.txt
@@ -75,7 +75,7 @@ FILE(GLOB _f_sources LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/${_DMF}/
 INCLUDE_DIRECTORIES(Includes_Generaux ${CMAKE_CURRENT_SOURCE_DIR})
 ADD_LIBRARY (${_DMF} STATIC ${_f_sources})
 
-TARGET_LINK_LIBRARIES(${_DMF} ${_DMC})
+#TARGET_LINK_LIBRARIES(${_DMF} ${_DMC})
 
 FOREACH(_HT_lib ${_HT_libs})
   HT_BUILD_LIBRARY(${_HT_lib})

diff --git a/src/tool/Dependance_Machine/dmport.h b/src/tool/Dependance_Machine/dmport.h
index ec18009f17a66d8dd528c974f4f2a5974fe45058..5929847a5b782f9368c15a64d4851627dba436c6 100644 (file)
--- a/src/tool/Dependance_Machine/dmport.h
+++ b/src/tool/Dependance_Machine/dmport.h
@@ -30,7 +30,7 @@
   typedef long INTGR ;
   #define INTEGER_NB_CHIFFRES_SIGNIFICATIFS 19
 #else
-#warning "-------- passage par else de ifdef _USE_64_BITS --------"
+#pragma message ( "-------- passage par else de ifdef _USE_64_BITS --------" )
   typedef int INTGR ;
   #define INTEGER_NB_CHIFFRES_SIGNIFICATIFS  9
 #endif