From cfb73ea195567454579b199b2b109e6f9373646f Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 26 Sep 2012 12:31:21 +0000 Subject: [PATCH] Porting SALOME KERNEL to CMake --- src/Communication/CMakeLists.txt | 2 +- src/Communication_SWIG/CMakeLists.txt | 2 +- src/Container/CMakeLists.txt | 2 +- src/DSC/DSC_Basic/CMakeLists.txt | 2 +- src/DSC/DSC_Python/CMakeLists.txt | 2 +- src/DSC/DSC_User/Basic/CMakeLists.txt | 2 +- src/DSC/DSC_User/CMakeLists.txt | 2 +- src/DSC/DSC_User/Datastream/CMakeLists.txt | 2 +- src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt | 2 +- src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt | 2 +- src/GenericObj/CMakeLists.txt | 2 +- src/KernelHelpers/CMakeLists.txt | 2 +- src/KernelHelpers/Test/CMakeLists.txt | 2 +- src/Launcher/CMakeLists.txt | 2 +- src/LifeCycleCORBA/CMakeLists.txt | 2 +- src/LifeCycleCORBA/Test/CMakeLists.txt | 2 +- src/LifeCycleCORBA_SWIG/CMakeLists.txt | 2 +- src/Logger/CMakeLists.txt | 2 +- src/MPIContainer/CMakeLists.txt | 2 +- src/ModuleCatalog/CMakeLists.txt | 2 +- src/NOTIFICATION_SWIG/CMakeLists.txt | 2 +- src/NamingService/CMakeLists.txt | 2 +- src/NamingService/Test/CMakeLists.txt | 2 +- src/Notification/CMakeLists.txt | 2 +- src/ParallelContainer/CMakeLists.txt | 2 +- src/Registry/CMakeLists.txt | 2 +- src/ResourcesManager/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/SALOMETraceCollector/CMakeLists.txt | 2 +- src/TOOLSDS/CMakeLists.txt | 2 +- src/TestContainer/CMakeLists.txt | 2 +- src/TestMPIContainer/CMakeLists.txt | 2 +- src/UnitTests/CMakeLists.txt | 2 +- src/Utils/CMakeLists.txt | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/Communication/CMakeLists.txt b/src/Communication/CMakeLists.txt index 4cb0ea1d3..4d1b1de03 100755 --- a/src/Communication/CMakeLists.txt +++ b/src/Communication/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils diff --git a/src/Communication_SWIG/CMakeLists.txt b/src/Communication_SWIG/CMakeLists.txt index 34543b966..8683fa5bd 100755 --- a/src/Communication_SWIG/CMakeLists.txt +++ b/src/Communication_SWIG/CMakeLists.txt @@ -26,7 +26,7 @@ SET_SOURCE_FILES_PROPERTIES(libSALOME_Comm.i PROPERTIES SWIG_DEFINITIONS "-shado INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Communication ${CMAKE_CURRENT_SOURCE_DIR}/../Basics diff --git a/src/Container/CMakeLists.txt b/src/Container/CMakeLists.txt index 313f43d24..541775c36 100755 --- a/src/Container/CMakeLists.txt +++ b/src/Container/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/DSC/DSC_Basic/CMakeLists.txt b/src/DSC/DSC_Basic/CMakeLists.txt index 23c91cce8..2889e0613 100755 --- a/src/DSC/DSC_Basic/CMakeLists.txt +++ b/src/DSC/DSC_Basic/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/Container ${CMAKE_SOURCE_DIR}/src/GenericObj ${CMAKE_SOURCE_DIR}/src/Notification diff --git a/src/DSC/DSC_Python/CMakeLists.txt b/src/DSC/DSC_Python/CMakeLists.txt index 56c4918ee..2b83e1961 100755 --- a/src/DSC/DSC_Python/CMakeLists.txt +++ b/src/DSC/DSC_Python/CMakeLists.txt @@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Palm diff --git a/src/DSC/DSC_User/Basic/CMakeLists.txt b/src/DSC/DSC_User/Basic/CMakeLists.txt index 31836de3b..3a2808cbb 100755 --- a/src/DSC/DSC_User/Basic/CMakeLists.txt +++ b/src/DSC/DSC_User/Basic/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/idl - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User ${CMAKE_SOURCE_DIR}/src/Container diff --git a/src/DSC/DSC_User/CMakeLists.txt b/src/DSC/DSC_User/CMakeLists.txt index 3df869328..779f14330 100755 --- a/src/DSC/DSC_User/CMakeLists.txt +++ b/src/DSC/DSC_User/CMakeLists.txt @@ -23,7 +23,7 @@ ADD_SUBDIRECTORY(Datastream) INCLUDE_DIRECTORIES( ${BOOST_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/Container ${CMAKE_SOURCE_DIR}/src/GenericObj ${CMAKE_SOURCE_DIR}/src/Notification diff --git a/src/DSC/DSC_User/Datastream/CMakeLists.txt b/src/DSC/DSC_User/Datastream/CMakeLists.txt index f26bd7c6a..eaca62a3c 100755 --- a/src/DSC/DSC_User/Datastream/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/CMakeLists.txt @@ -22,7 +22,7 @@ ADD_SUBDIRECTORY(Calcium) INCLUDE_DIRECTORIES( ${BOOST_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User ${CMAKE_BINARY_DIR}/src/DSC/DSC_User/Datastream/Palm ${CMAKE_BINARY_DIR}/src/DSC/DSC_User/Datastream/Calcium diff --git a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt index 708311a8e..ef281ec42 100755 --- a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${BOOST_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Palm diff --git a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt index ece77cee7..4976d94df 100755 --- a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt @@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic diff --git a/src/GenericObj/CMakeLists.txt b/src/GenericObj/CMakeLists.txt index ab3b87f6c..203be8e04 100755 --- a/src/GenericObj/CMakeLists.txt +++ b/src/GenericObj/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_BINARY_DIR}/idl diff --git a/src/KernelHelpers/CMakeLists.txt b/src/KernelHelpers/CMakeLists.txt index 62e0c90ef..09e211bb3 100755 --- a/src/KernelHelpers/CMakeLists.txt +++ b/src/KernelHelpers/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Basics diff --git a/src/KernelHelpers/Test/CMakeLists.txt b/src/KernelHelpers/Test/CMakeLists.txt index 9797d0bf5..f0291aaf5 100755 --- a/src/KernelHelpers/Test/CMakeLists.txt +++ b/src/KernelHelpers/Test/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/src/NamingService diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt index bddf4e6a7..a2e7ea0dc 100755 --- a/src/Launcher/CMakeLists.txt +++ b/src/Launcher/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS} ${LIBBATCH_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/LifeCycleCORBA/CMakeLists.txt b/src/LifeCycleCORBA/CMakeLists.txt index 59c6eaf01..a635b4061 100755 --- a/src/LifeCycleCORBA/CMakeLists.txt +++ b/src/LifeCycleCORBA/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMETraceCollector diff --git a/src/LifeCycleCORBA/Test/CMakeLists.txt b/src/LifeCycleCORBA/Test/CMakeLists.txt index 89221ff63..47c04bd74 100755 --- a/src/LifeCycleCORBA/Test/CMakeLists.txt +++ b/src/LifeCycleCORBA/Test/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace diff --git a/src/LifeCycleCORBA_SWIG/CMakeLists.txt b/src/LifeCycleCORBA_SWIG/CMakeLists.txt index 72737ab2b..2e98f4c59 100755 --- a/src/LifeCycleCORBA_SWIG/CMakeLists.txt +++ b/src/LifeCycleCORBA_SWIG/CMakeLists.txt @@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/Logger/CMakeLists.txt b/src/Logger/CMakeLists.txt index f18ae2bdf..6b7c86d3c 100755 --- a/src/Logger/CMakeLists.txt +++ b/src/Logger/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_BINARY_DIR}/idl diff --git a/src/MPIContainer/CMakeLists.txt b/src/MPIContainer/CMakeLists.txt index 0308be072..890118060 100755 --- a/src/MPIContainer/CMakeLists.txt +++ b/src/MPIContainer/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${MPI_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/ModuleCatalog/CMakeLists.txt b/src/ModuleCatalog/CMakeLists.txt index a134d9c41..3e8f048ef 100755 --- a/src/ModuleCatalog/CMakeLists.txt +++ b/src/ModuleCatalog/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/NOTIFICATION_SWIG/CMakeLists.txt b/src/NOTIFICATION_SWIG/CMakeLists.txt index c1b8d8c61..8d22ebc63 100755 --- a/src/NOTIFICATION_SWIG/CMakeLists.txt +++ b/src/NOTIFICATION_SWIG/CMakeLists.txt @@ -29,7 +29,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Notification ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace diff --git a/src/NamingService/CMakeLists.txt b/src/NamingService/CMakeLists.txt index bb4722fea..b2542217b 100755 --- a/src/NamingService/CMakeLists.txt +++ b/src/NamingService/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils diff --git a/src/NamingService/Test/CMakeLists.txt b/src/NamingService/Test/CMakeLists.txt index 31b28bd01..6f675c91d 100755 --- a/src/NamingService/Test/CMakeLists.txt +++ b/src/NamingService/Test/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace diff --git a/src/Notification/CMakeLists.txt b/src/Notification/CMakeLists.txt index 58e31d33c..571ff7814 100755 --- a/src/Notification/CMakeLists.txt +++ b/src/Notification/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils diff --git a/src/ParallelContainer/CMakeLists.txt b/src/ParallelContainer/CMakeLists.txt index 1b3595ede..bbaad6bfc 100755 --- a/src/ParallelContainer/CMakeLists.txt +++ b/src/ParallelContainer/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${MPI_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${PACO_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_SOURCE_DIR}/src/Container ${CMAKE_SOURCE_DIR}/src/Notification ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace diff --git a/src/Registry/CMakeLists.txt b/src/Registry/CMakeLists.txt index 09bcb2b5b..154880672 100755 --- a/src/Registry/CMakeLists.txt +++ b/src/Registry/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/ResourcesManager/CMakeLists.txt b/src/ResourcesManager/CMakeLists.txt index 04d37967f..10cb294ad 100755 --- a/src/ResourcesManager/CMakeLists.txt +++ b/src/ResourcesManager/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${LIBXML_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/SALOMEDS/CMakeLists.txt b/src/SALOMEDS/CMakeLists.txt index 9ba9076a7..e1d4820db 100755 --- a/src/SALOMEDS/CMakeLists.txt +++ b/src/SALOMEDS/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace diff --git a/src/SALOMEDS/Test/CMakeLists.txt b/src/SALOMEDS/Test/CMakeLists.txt index 380669ddd..069385256 100755 --- a/src/SALOMEDS/Test/CMakeLists.txt +++ b/src/SALOMEDS/Test/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace diff --git a/src/SALOMEDSClient/CMakeLists.txt b/src/SALOMEDSClient/CMakeLists.txt index efaf1ad8a..84df7a383 100755 --- a/src/SALOMEDSClient/CMakeLists.txt +++ b/src/SALOMEDSClient/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_BINARY_DIR}/idl ) diff --git a/src/SALOMEDSImpl/CMakeLists.txt b/src/SALOMEDSImpl/CMakeLists.txt index f91f7e08b..d3daf020f 100755 --- a/src/SALOMEDSImpl/CMakeLists.txt +++ b/src/SALOMEDSImpl/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist diff --git a/src/SALOMETraceCollector/CMakeLists.txt b/src/SALOMETraceCollector/CMakeLists.txt index 11da0038f..6e9ea5bfe 100755 --- a/src/SALOMETraceCollector/CMakeLists.txt +++ b/src/SALOMETraceCollector/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_BINARY_DIR}/idl diff --git a/src/TOOLSDS/CMakeLists.txt b/src/TOOLSDS/CMakeLists.txt index a56319d18..496d9a42d 100755 --- a/src/TOOLSDS/CMakeLists.txt +++ b/src/TOOLSDS/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../Utils diff --git a/src/TestContainer/CMakeLists.txt b/src/TestContainer/CMakeLists.txt index 193e53071..d881e5e94 100755 --- a/src/TestContainer/CMakeLists.txt +++ b/src/TestContainer/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/TestMPIContainer/CMakeLists.txt b/src/TestMPIContainer/CMakeLists.txt index 8ca5c698a..65038b42f 100755 --- a/src/TestMPIContainer/CMakeLists.txt +++ b/src/TestMPIContainer/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${MPI_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt index a9de09ecd..11545cfff 100755 --- a/src/UnitTests/CMakeLists.txt +++ b/src/UnitTests/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt index ca3adcd93..269d62c59 100755 --- a/src/Utils/CMakeLists.txt +++ b/src/Utils/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm/unix + ${CMAKE_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace -- 2.39.2