Merge branch 'V9_4_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d77181ee824669ce283be816ab3688a4ecf30c0f..a67e8504e396950c1453dc27479c015dd0e365f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/src/FrontTrack/CMakeLists.txt b/src/FrontTrack/CMakeLists.txt
index ea2ca2c09f0e00db73f0367dc526ca03fae142c6..ea0f90edb77b7fb11f433686e23181c8aec1e56d 100644 (file)
--- a/src/FrontTrack/CMakeLists.txt
+++ b/src/FrontTrack/CMakeLists.txt
@@ -21,7 +21,6 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OpenCASCADE_INCLUDE_DIR}
-  ${Boost_INCLUDE_DIRS}
   ${GEOM_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
   ${MEDCOUPLING_INCLUDE_DIRS}
@@ -31,7 +30,6 @@ INCLUDE_DIRECTORIES(
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${OpenCASCADE_DEFINITIONS}
-  ${BOOST_DEFINITIONS}
 )
 
 IF(FRONTTRACK_USE_TBB)
@@ -46,7 +44,6 @@ SET(_link_LIBRARIES
   ${GEOM_XAO}
   ${MEDCoupling_medloader}
   ${TBB_LIBS}
-  ${Boost_LIBRARIES}
 )
 
 # --- headers ---

diff --git a/src/HOMARDGUI/CMakeLists.txt b/src/HOMARDGUI/CMakeLists.txt
index 8d04f2b4842d103d8673fae8759835ff8e523ba2..85d8da48d85cf702dcc65d69bda1ee8a4ef0c302 100644 (file)
--- a/src/HOMARDGUI/CMakeLists.txt
+++ b/src/HOMARDGUI/CMakeLists.txt
@@ -29,7 +29,6 @@ INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
-  ${Boost_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}
@@ -44,7 +43,6 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${BOOST_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${OpenCASCADE_DEFINITIONS}
   ${KERNEL_DEFINITIONS}