Porting SALOME KERNEL to CMake

diff --git a/src/Communication/CMakeLists.txt b/src/Communication/CMakeLists.txt
index 4cb0ea1d334ba529db20105b8faea1be57ac1758..4d1b1de036b11c2e9309ef7f64308da95512c148 100755 (executable)
--- 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 34543b96608fdc4bd2344ab2c1a34ffd4dd730c1..8683fa5bdb7c8f7f893f070fd9a4974335bfd59f 100755 (executable)
--- 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 313f43d241581a9cfb699a47b4637f7e51982bb1..541775c36de184d2b9326e3e0e10f796e5934e02 100755 (executable)
--- 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 23c91cce85117d755ae79818f6968a12194d7a2d..2889e061386b9932c30814b877855250af0b8acf 100755 (executable)
--- 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 56c4918eec84d2decf8f7a1c2540fadd0a897735..2b83e1961f5840a89cd33a2a77218fc77839980b 100755 (executable)
--- 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 31836de3b78e99890abed19a7465262be437d67e..3a2808cbb996eb9a2e58cc1bc6dffca930903253 100755 (executable)
--- 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 3df86932881bd858952d47b6c4778db0c1ab8e17..779f143305fb5f91ce47151fed762679bb207ed4 100755 (executable)
--- 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 f26bd7c6aea46d74502b326e3ff888fd02deeed0..eaca62a3c5574fe055856b468b1c2be0f2b3c43a 100755 (executable)
--- 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 708311a8e4f46b3b46c86f9bd63801efcc976a67..ef281ec42800851842ddd3913d5a7d2bade8a5c1 100755 (executable)
--- 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 ece77cee79b971173cff84de6b1a4cc28a1149da..4976d94df3bc8d9ca6575a6c51db1cc3830d8e1a 100755 (executable)
--- 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 ab3b87f6cd31ca29b3c032de9a61e097dfdce8e6..203be8e0490ff9c73ac7ae04852d2fcf17cd2d1d 100755 (executable)
--- 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 62e0c90ef69b551513db61528d022df008f669a4..09e211bb370e2fadc0a15e08c528b6e295741e1f 100755 (executable)
--- 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 9797d0bf5b83ec41ace2a99a52f933d90cf8d194..f0291aaf5453c8ea474cb05fb4b69aff0ff1e831 100755 (executable)
--- 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 bddf4e6a7d262c2e01e31a2775f4a4f159ef014a..a2e7ea0dc2657e028d0a2c371b4c23c7ba11b8d5 100755 (executable)
--- 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 59c6eaf019a484d9cc415c391c67d1d37e5ff30e..a635b40619ad25376fe31a96e201e80f92e00006 100755 (executable)
--- 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 89221ff63ca96db688fc6c43b31942294ad0174e..47c04bd740c67ce3f97036b469a8a5eaab043fde 100755 (executable)
--- 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 72737ab2bc8f55a144f9e680cfd3bea19fb0ca4a..2e98f4c59e05c24194f03ea9747360ae143ab68d 100755 (executable)
--- 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 f18ae2bdf97f1c139a694b8dc65c1d6659f33119..6b7c86d3c2494bfb8997f8a67a48b98e860ae895 100755 (executable)
--- 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 0308be072dbb320dcb8f829adf97e898886577f9..89011806004bbbf88f5c3ef6cf9b0fa7c987d80c 100755 (executable)
--- 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 a134d9c41ca465e9e54a74c8b941542e2b82d03a..3e8f048effd3a1cf27dbb5688f1498f4e2455a41 100755 (executable)
--- 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 c1b8d8c61b9b296147e23068148628b04bdd23f3..8d22ebc635bf385119b570aa160919d637eb96ef 100755 (executable)
--- 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 bb4722fea7370090afbcbf8e9ebcbeda068a9d86..b2542217b333e21ec85c361ff4309b78cf615426 100755 (executable)
--- 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 31b28bd01554f41ed27d29383d909eb0ab7b3494..6f675c91d209abd9488baa64dd48f485cf0e580a 100755 (executable)
--- 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 58e31d33c498cab56dcc330437e8098cfa7792a0..571ff7814e1a67aeb1f62a0dc04b7ce4674a37c5 100755 (executable)
--- 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 1b3595edef5345a0eb47e08761fbe0268a1a06c8..bbaad6bfc0b3ccb638014f7c9d9716fc812edfb9 100755 (executable)
--- 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 09bcb2b5b8088749bc9254e8bbbe75f9db8ca22f..15488067246aa779430651e6f126ad4a78c0147e 100755 (executable)
--- 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 04d37967fb554c903a00b22c646bbcbbc493bbf1..10cb294ad2d5b228773aae952727f487266cad37 100755 (executable)
--- 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 9ba9076a76fd3c13d9a8ab74772757c38a9d8278..e1d4820db846e422e608a0c2d778d7ae5b16d677 100755 (executable)
--- 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 380669ddd0dce9b65bf7a2962c4baa4f5e390dcb..0693852569b897ccba059479bad690296900fbd3 100755 (executable)
--- 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 efaf1ad8ae2ce7353b2841b5a087b31cb0b858b1..84df7a3836767a14798ecc78d38a9ec5e9cb65cb 100755 (executable)
--- 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 f91f7e08b881312adb95a3a35454f3da6a6235bb..d3daf020ffc3768d1bf9e8f0047d0d3fba482f3b 100755 (executable)
--- 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 11da0038f35b48322597e400a169283f7557be23..6e9ea5bfe3bf49e395a87547e77ae898909e5f42 100755 (executable)
--- 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 a56319d188a830c4c60ba4355d01a2017c7500f3..496d9a42d2aa55efdf1a14d9c5fde05e0a88f384 100755 (executable)
--- 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 193e530718c53a79e79385e9261f92fb79f4390c..d881e5e94a93e81bb8aa85e8ba0b2818698db721 100755 (executable)
--- 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 8ca5c698aca2db9962a59c8b5f12c1a2dae1604d..65038b42f2bb495317f83c09db475367a40aa7ad 100755 (executable)
--- 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 a9de09ecd5455eaced34e6f0136c6efcd160695b..11545cfff63aec6a81cf382cb1636545931e1a55 100755 (executable)
--- 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 ca3adcd93511a9285b342fda6b43cf10814cabcb..269d62c59f244fc8f37b30b3a18fcbe4f9cc3cc8 100755 (executable)
--- 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