From 71009e636a16715a5e097cda7f92dd46774dcf1c Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 1 Mar 2013 08:53:22 +0000 Subject: [PATCH] Correction of the boost includes. --- src/GuiHelpers/CMakeLists.txt | 2 +- src/Plot2d/CMakeLists.txt | 2 +- src/QxGraph/CMakeLists.txt | 2 +- src/QxScene/CMakeLists.txt | 2 +- src/SALOME_PY/CMakeLists.txt | 2 +- src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt | 2 +- src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt | 2 +- src/SALOME_PYQT/SalomePyQt/CMakeLists.txt | 2 +- src/SALOME_SWIG/CMakeLists.txt | 2 +- src/SOCC/CMakeLists.txt | 2 +- src/SPlot2d/CMakeLists.txt | 2 +- src/SUPERVGraph/CMakeLists.txt | 2 +- src/SVTK/CMakeLists.txt | 2 +- src/SalomeApp/CMakeLists.txt | 2 +- src/Session/CMakeLists.txt | 2 +- src/TOOLSGUI/CMakeLists.txt | 2 +- src/TreeData/CMakeLists.txt | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/GuiHelpers/CMakeLists.txt b/src/GuiHelpers/CMakeLists.txt index faddd19a4..a8c80967e 100755 --- a/src/GuiHelpers/CMakeLists.txt +++ b/src/GuiHelpers/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome diff --git a/src/Plot2d/CMakeLists.txt b/src/Plot2d/CMakeLists.txt index 713a2713f..4531a5e0c 100755 --- a/src/Plot2d/CMakeLists.txt +++ b/src/Plot2d/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake) INCLUDE_DIRECTORIES( ${QWT_INCLUDE_DIR} ${QT_INCLUDES} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx diff --git a/src/QxGraph/CMakeLists.txt b/src/QxGraph/CMakeLists.txt index 662cc5eef..18b25ba57 100755 --- a/src/QxGraph/CMakeLists.txt +++ b/src/QxGraph/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake) INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx diff --git a/src/QxScene/CMakeLists.txt b/src/QxScene/CMakeLists.txt index 59f4d468b..4923fa5f6 100755 --- a/src/QxScene/CMakeLists.txt +++ b/src/QxScene/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake) INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx diff --git a/src/SALOME_PY/CMakeLists.txt b/src/SALOME_PY/CMakeLists.txt index 6fe2ffc4e..799fe74a2 100755 --- a/src/SALOME_PY/CMakeLists.txt +++ b/src/SALOME_PY/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} ${PYTHON_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt index 40a9e8d25..fd5057149 100755 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${SIP_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt index c4c80d4d3..abb02c164 100755 --- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt +++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} ${SIP_INCLUDE_DIR} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} diff --git a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt index 441239a8c..112a17800 100755 --- a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt +++ b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${QWT_INCLUDE_DIR} ${SIP_INCLUDE_DIR} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} diff --git a/src/SALOME_SWIG/CMakeLists.txt b/src/SALOME_SWIG/CMakeLists.txt index 06bf37fec..5b98e9aae 100755 --- a/src/SALOME_SWIG/CMakeLists.txt +++ b/src/SALOME_SWIG/CMakeLists.txt @@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${QWT_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/salome_adm diff --git a/src/SOCC/CMakeLists.txt b/src/SOCC/CMakeLists.txt index a111cf9a0..25725d2d3 100755 --- a/src/SOCC/CMakeLists.txt +++ b/src/SOCC/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT diff --git a/src/SPlot2d/CMakeLists.txt b/src/SPlot2d/CMakeLists.txt index 70f4c26c7..d2666caaf 100755 --- a/src/SPlot2d/CMakeLists.txt +++ b/src/SPlot2d/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${QWT_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome diff --git a/src/SUPERVGraph/CMakeLists.txt b/src/SUPERVGraph/CMakeLists.txt index 1140e6dad..e38341016 100755 --- a/src/SUPERVGraph/CMakeLists.txt +++ b/src/SUPERVGraph/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake) INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt index 90a85743e..5cad6454b 100755 --- a/src/SVTK/CMakeLists.txt +++ b/src/SVTK/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${VTK_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx diff --git a/src/SalomeApp/CMakeLists.txt b/src/SalomeApp/CMakeLists.txt index a7bdab445..ba95a0531 100755 --- a/src/SalomeApp/CMakeLists.txt +++ b/src/SalomeApp/CMakeLists.txt @@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${VTK_INCLUDE_DIRS} ${QWT_INCLUDE_DIR} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} diff --git a/src/Session/CMakeLists.txt b/src/Session/CMakeLists.txt index 5e16543de..8f81cd9c7 100755 --- a/src/Session/CMakeLists.txt +++ b/src/Session/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${CAS_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} diff --git a/src/TOOLSGUI/CMakeLists.txt b/src/TOOLSGUI/CMakeLists.txt index 3be5ad58f..8a6b024c4 100755 --- a/src/TOOLSGUI/CMakeLists.txt +++ b/src/TOOLSGUI/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} ${OMNIORB_INCLUDE_DIR} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_BINARY_DIR}/idl diff --git a/src/TreeData/CMakeLists.txt b/src/TreeData/CMakeLists.txt index 90eeae5d1..67854cef4 100755 --- a/src/TreeData/CMakeLists.txt +++ b/src/TreeData/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ${CAS_INCLUDE_DIRS} ${QT_INCLUDES} ${OMNIORB_INCLUDE_DIR} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/../SalomeApp -- 2.39.2