From 1a13e3550e18481a1becd41e6c67a47ab0cf189f Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Mar 2021 16:06:47 +0300 Subject: [PATCH] Correct boost headers variable --- src/DF/CMakeLists.txt | 2 +- src/Launcher/CMakeLists.txt | 2 +- src/SALOMEDS/CMakeLists.txt | 2 +- src/SALOMEDS/Test/CMakeLists.txt | 2 +- src/SALOMEDSClient/CMakeLists.txt | 2 +- src/SALOMEDSImpl/CMakeLists.txt | 2 +- src/SALOMEDSImpl/Test/CMakeLists.txt | 2 +- src/TOOLSDS/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/DF/CMakeLists.txt b/src/DF/CMakeLists.txt index c56ef7cfb..d763f43a4 100644 --- a/src/DF/CMakeLists.txt +++ b/src/DF/CMakeLists.txt @@ -18,7 +18,7 @@ # INCLUDE_DIRECTORIES( - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ) ADD_DEFINITIONS(${BOOST_DEFINITIONS}) diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt index 708836437..26e4ee0fe 100644 --- a/src/Launcher/CMakeLists.txt +++ b/src/Launcher/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${LIBBATCH_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics diff --git a/src/SALOMEDS/CMakeLists.txt b/src/SALOMEDS/CMakeLists.txt index 0ab1bd239..55512a32c 100644 --- a/src/SALOMEDS/CMakeLists.txt +++ b/src/SALOMEDS/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist diff --git a/src/SALOMEDS/Test/CMakeLists.txt b/src/SALOMEDS/Test/CMakeLists.txt index bec056549..0291acb23 100644 --- a/src/SALOMEDS/Test/CMakeLists.txt +++ b/src/SALOMEDS/Test/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics diff --git a/src/SALOMEDSClient/CMakeLists.txt b/src/SALOMEDSClient/CMakeLists.txt index 8b17fb7cf..ea008e1e5 100644 --- a/src/SALOMEDSClient/CMakeLists.txt +++ b/src/SALOMEDSClient/CMakeLists.txt @@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm ${PROJECT_BINARY_DIR}/idl ) diff --git a/src/SALOMEDSImpl/CMakeLists.txt b/src/SALOMEDSImpl/CMakeLists.txt index 7362489c2..088d8e275 100644 --- a/src/SALOMEDSImpl/CMakeLists.txt +++ b/src/SALOMEDSImpl/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace diff --git a/src/SALOMEDSImpl/Test/CMakeLists.txt b/src/SALOMEDSImpl/Test/CMakeLists.txt index 33b649df4..e8c0e1752 100644 --- a/src/SALOMEDSImpl/Test/CMakeLists.txt +++ b/src/SALOMEDSImpl/Test/CMakeLists.txt @@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics diff --git a/src/TOOLSDS/CMakeLists.txt b/src/TOOLSDS/CMakeLists.txt index 81520c256..abf44ae01 100644 --- a/src/TOOLSDS/CMakeLists.txt +++ b/src/TOOLSDS/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Basics -- 2.39.2