From: ana <ana@opencascade.com>
Date: Mon, 9 Sep 2013 09:09:40 +0000 (+0000)
Subject: Compilation SALOME on Windows
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1c8eea67281022e4bda8fb7388da634fe3b535a2;p=modules%2Fyacs.git

Compilation SALOME on Windows
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d40fb2578..a4f498cdf 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,16 +190,22 @@ INCLUDE(CMakePackageConfigHelpers)
 
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
+
+# Temporary solution for pakage src\DSC on windows
+IF(NOT WINDOWS)
+  SET(DSC_TGS CalciumC SalomeCalcium SalomeDatastream 
+  SalomePalm SalomeDSCSupervBasic SalomeDSCSuperv)
+ENDIF(NOT WINDOWS)
+
 SET(_${PROJECT_NAME}_exposed_targets
-  CalciumC SalomeCalcium DF Launcher  
-  OpUtil Registry ResourcesManager SALOMEBasics SalomeCatalog SalomeCommunication
-  SalomeContainer SalomeDatastream SalomePalm SalomeDSCContainer SalomeDSClient
-  SalomeDSCSupervBasic SalomeDSCSuperv SalomeDSImpl 
-  SalomeDS  SalomeGenericObj SalomeHDFPersist SalomeIDLKernel
-  SalomeLauncher  SalomeLifeCycleCORBA  SALOMELocalTrace 
+  ${DSC_TGS} DF Launcher OpUtil Registry ResourcesManager 
+  SALOMEBasics SalomeCatalog SalomeCommunication SalomeContainer 
+  SalomeDSCContainer SalomeDSClient SalomeDSImpl 
+  SalomeDS SalomeGenericObj SalomeHDFPersist SalomeIDLKernel
+  SalomeLauncher SalomeLifeCycleCORBA SALOMELocalTrace 
   SalomeLoggerServer SalomeNotification SalomeNS
-  SalomeResourcesManager  
-  TOOLSDS  with_loggerTraceCollector SalomeKernelHelpers)
+  SalomeResourcesManager TOOLSDS with_loggerTraceCollector 
+  SalomeKernelHelpers)
   
 # MPI specific targets:
 IF(SALOME_USE_MPI)
diff --git a/salome_adm/cmake_files/FindMEDFile.cmake b/salome_adm/cmake_files/FindMEDFile.cmake
index 19f5746ad..3b08b6a6c 100644
--- a/salome_adm/cmake_files/FindMEDFile.cmake
+++ b/salome_adm/cmake_files/FindMEDFile.cmake
@@ -42,8 +42,8 @@ ENDIF(MEDFILE_ROOT_DIR)
 
 FIND_PATH(MEDFILE_INCLUDE_DIRS med.h)
 #FIND_PROGRAM(MDUMP mdump)
-FIND_LIBRARY(MEDFILE_C_LIBRARIES libmedC.so medC)
-FIND_LIBRARY(MEDFILE_F_LIBRARIES libmed.so med)
+FIND_LIBRARY(MEDFILE_C_LIBRARIES NAMES libmedC.so medC)
+FIND_LIBRARY(MEDFILE_F_LIBRARIES NAMES libmed.so med)
 IF(MEDFILE_F_LIBRARIES)
   SET(MEDFILE_LIBRARIES ${MEDFILE_C_LIBRARIES} ${MEDFILE_F_LIBRARIES})
 ELSE(MEDFILE_F_LIBRARIES)
diff --git a/salome_adm/cmake_files/FindOmniORB.cmake b/salome_adm/cmake_files/FindOmniORB.cmake
index 397b4b6c0..b6680e701 100644
--- a/salome_adm/cmake_files/FindOmniORB.cmake
+++ b/salome_adm/cmake_files/FindOmniORB.cmake
@@ -56,11 +56,11 @@ FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h)
 ##############################################################################
 IF (WIN32)
   FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 
-    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omniORB4${CMAKE_STATIC_LIBRARY_SUFFIX})
+    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omniORB4_rt${CMAKE_STATIC_LIBRARY_SUFFIX})
   FIND_LIBRARY( OMNIORB_LIBRARY_omnithread
-    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omnithread${CMAKE_STATIC_LIBRARY_SUFFIX})
+    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omnithread_rt${CMAKE_STATIC_LIBRARY_SUFFIX})
   FIND_LIBRARY( OMNIORB_LIBRARY_omniDynamic4
-    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omniDynamic4${CMAKE_STATIC_LIBRARY_SUFFIX})
+    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omniDynamic4_rt${CMAKE_STATIC_LIBRARY_SUFFIX})
 ELSE (WIN32)
   FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 NAMES omniORB4)
   FIND_LIBRARY(OMNIORB_LIBRARY_omnithread NAMES omnithread)
@@ -71,9 +71,9 @@ ENDIF (WIN32)
 
 IF (WIN32)
   FIND_LIBRARY( OMNIORB_LIBRARY_COS4
-    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}COS4${CMAKE_STATIC_LIBRARY_SUFFIX})
+    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}COS4_rt${CMAKE_STATIC_LIBRARY_SUFFIX})
   FIND_LIBRARY( OMNIORB_LIBRARY_COSDynamic4
-    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}COSDynamic4${CMAKE_STATIC_LIBRARY_SUFFIX}) 
+    NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}COSDynamic4_rt${CMAKE_STATIC_LIBRARY_SUFFIX}) 
 ELSE (WIN32)
   FIND_LIBRARY(OMNIORB_LIBRARY_COS4 NAMES COS4)
   FIND_LIBRARY(OMNIORB_LIBRARY_COSDynamic4 NAMES COSDynamic4)
diff --git a/salome_adm/cmake_files/FindSalomeHDF5.cmake b/salome_adm/cmake_files/FindSalomeHDF5.cmake
index ed481f9df..d607ef7df 100644
--- a/salome_adm/cmake_files/FindSalomeHDF5.cmake
+++ b/salome_adm/cmake_files/FindSalomeHDF5.cmake
@@ -27,6 +27,11 @@
 #  MPI root directory used for HDF5 compilation is exposed into MPI_ROOT_DIR_EXP
 #
 
+if(WINDOWS)
+  set(PREV_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  set(CMAKE_FIND_LIBRARY_SUFFIXES dll${CMAKE_IMPORT_LIBRARY_SUFFIX})
+endif(WINDOWS)
+
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(HDF5 HDF5_INCLUDE_DIR 1)
 MARK_AS_ADVANCED(FORCE HDF5_INCLUDE_DIR HDF5_LIB HDF5_DIR)
 
@@ -74,3 +79,7 @@ ENDIF()
 IF(HDF5_IS_PARALLEL AND NOT SALOME_USE_MPI)
    MESSAGE(FATAL_ERROR "HDF5 is compiled with MPI, you have to set SALOME_USE_MPI to ON")
 ENDIF()
+
+if(WINDOWS)
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ${PREV_CMAKE_FIND_LIBRARY_SUFFIXES})
+endif(WINDOWS)
diff --git a/salome_adm/cmake_files/FindSalomePython.cmake b/salome_adm/cmake_files/FindSalomePython.cmake
index d1ef5532a..d7e2ba824 100644
--- a/salome_adm/cmake_files/FindSalomePython.cmake
+++ b/salome_adm/cmake_files/FindSalomePython.cmake
@@ -45,6 +45,12 @@ ENDIF()
 SET(PYTHON_ROOT_DIR "${_dflt_value}" CACHE PATH "Path to Python directory (interpreter and libs)")
 
 # 2. Find package - config mode first (i.e. looking for XYZ-config.cmake)
+IF(WINDOWS)
+ IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+  SET(PythonInterp_FIND_VERSION _d)
+  SET(PYTHON_DEFINITIONS "-DHAVE_DEBUG_PYTHON")
+ ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug)
+ENDIF(WINDOWS)
 IF(EXISTS "${PYTHON_ROOT_DIR}")
   # Hope to find direclty a CMake config file there
   SET(_CONF_DIR "${PYTHON_ROOT_DIR}/share/cmake") 
diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py
index fac70cb18..dcc4a7411 100644
--- a/salome_adm/cmake_files/deprecated/am2cmake.py
+++ b/salome_adm/cmake_files/deprecated/am2cmake.py
@@ -550,6 +550,7 @@ class CMakeFile(object):
                         INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindSWIG.cmake)
                         INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake)
                         INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindDOXYGEN.cmake)
+                        INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake)
                         INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSalomeLIBBATCH.cmake)
                         INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindKERNEL.cmake)
                         """)
@@ -596,8 +597,9 @@ class CMakeFile(object):
                             SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR})
                             INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindQWT.cmake)
                             INCLUDE(${GEOM_ROOT_DIR}/adm_local/cmake_files/FindGEOM.cmake)
-                            INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMEDFILE.cmake)
-                            INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake)
+                            INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake)
+
+                            INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindSalomeMED.cmake)
                             INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSPHINX.cmake)
                             """)
                             pass
diff --git a/src/Basics/CMakeLists.txt b/src/Basics/CMakeLists.txt
index 6a32248cc..79b34790e 100755
--- a/src/Basics/CMakeLists.txt
+++ b/src/Basics/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
 )
 
 SET(SALOMEBasics_SOURCES
@@ -34,7 +34,7 @@ SET(SALOMEBasics_SOURCES
 ADD_LIBRARY(SALOMEBasics ${SALOMEBasics_SOURCES})
 INSTALL(TARGETS SALOMEBasics EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-TARGET_LINK_LIBRARIES(SALOMEBasics ${PLATFORM_LIBS})
+TARGET_LINK_LIBRARIES(SALOMEBasics ${PLATFORM_LIBS} ${PTHREAD_LIBRARIES})
 
 FILE(GLOB SALOMEBasics_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
 INSTALL(FILES ${SALOMEBasics_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
diff --git a/src/Communication/CMakeLists.txt b/src/Communication/CMakeLists.txt
index fe20f48bd..eb3966ae9 100755
--- a/src/Communication/CMakeLists.txt
+++ b/src/Communication/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${MPI_CXX_INCLUDE_PATH}
   ${PYTHON_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/salome_adm
diff --git a/src/DF/CMakeLists.txt b/src/DF/CMakeLists.txt
index 73760e25a..76c0e40c9 100755
--- a/src/DF/CMakeLists.txt
+++ b/src/DF/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${Boost_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIR}
 )
 ADD_DEFINITIONS(${BOOST_DEFINITIONS})
 
diff --git a/src/DSC/DSC_Basic/CMakeLists.txt b/src/DSC/DSC_Basic/CMakeLists.txt
index 9620d9d33..f8cd1f211 100755
--- a/src/DSC/DSC_Basic/CMakeLists.txt
+++ b/src/DSC/DSC_Basic/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${PROJECT_SOURCE_DIR}/src/Container
diff --git a/src/GenericObj/CMakeLists.txt b/src/GenericObj/CMakeLists.txt
index f24af77cb..8398fb94e 100755
--- a/src/GenericObj/CMakeLists.txt
+++ b/src/GenericObj/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
diff --git a/src/KernelHelpers/CMakeLists.txt b/src/KernelHelpers/CMakeLists.txt
index d7125dda5..75fc4d6d7 100755
--- a/src/KernelHelpers/CMakeLists.txt
+++ b/src/KernelHelpers/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService
diff --git a/src/KernelHelpers/Test/CMakeLists.txt b/src/KernelHelpers/Test/CMakeLists.txt
index 37188eca0..594bfbeb5 100755
--- a/src/KernelHelpers/Test/CMakeLists.txt
+++ b/src/KernelHelpers/Test/CMakeLists.txt
@@ -20,6 +20,7 @@
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${PROJECT_SOURCE_DIR}/src/Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/..
diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt
index 05abbeff0..04468440d 100755
--- a/src/Launcher/CMakeLists.txt
+++ b/src/Launcher/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(
   ${LIBXML2_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${MPI_CXX_INCLUDE_PATH}
   ${LIBBATCH_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/salome_adm
diff --git a/src/LifeCycleCORBA/CMakeLists.txt b/src/LifeCycleCORBA/CMakeLists.txt
index 34e13346c..17a3fb21b 100755
--- a/src/LifeCycleCORBA/CMakeLists.txt
+++ b/src/LifeCycleCORBA/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE_DIRECTORIES(
   ${LIBXML2_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
diff --git a/src/LifeCycleCORBA/Test/CMakeLists.txt b/src/LifeCycleCORBA/Test/CMakeLists.txt
index da514757a..ae1744da1 100755
--- a/src/LifeCycleCORBA/Test/CMakeLists.txt
+++ b/src/LifeCycleCORBA/Test/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${CPPUNIT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
diff --git a/src/LifeCycleCORBA_SWIG/CMakeLists.txt b/src/LifeCycleCORBA_SWIG/CMakeLists.txt
index 40bf7d6a4..6ff5094e9 100755
--- a/src/LifeCycleCORBA_SWIG/CMakeLists.txt
+++ b/src/LifeCycleCORBA_SWIG/CMakeLists.txt
@@ -25,7 +25,7 @@ ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/Logger/CMakeLists.txt b/src/Logger/CMakeLists.txt
index fdbae1565..dc590301f 100755
--- a/src/Logger/CMakeLists.txt
+++ b/src/Logger/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
diff --git a/src/ModuleCatalog/CMakeLists.txt b/src/ModuleCatalog/CMakeLists.txt
index 9f7f0acbf..6dde8d4ad 100755
--- a/src/ModuleCatalog/CMakeLists.txt
+++ b/src/ModuleCatalog/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
diff --git a/src/NOTIFICATION_SWIG/CMakeLists.txt b/src/NOTIFICATION_SWIG/CMakeLists.txt
index 7cc2f38f6..fc52f72d5 100755
--- a/src/NOTIFICATION_SWIG/CMakeLists.txt
+++ b/src/NOTIFICATION_SWIG/CMakeLists.txt
@@ -25,7 +25,7 @@ SET_SOURCE_FILES_PROPERTIES(NOTIFICATIONPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS
 
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
@@ -39,7 +39,7 @@ SET_SOURCE_FILES_PROPERTIES(NOTIFICATION.i PROPERTIES SWIG_MODULE_NAME libNOTIFI
 
 SWIG_ADD_MODULE(libNOTIFICATION python NOTIFICATION.i NOTIFICATION_Swig.cxx)
 SWIG_LINK_LIBRARIES(libNOTIFICATION ${PYTHON_LIBRARIES} SalomeNotification)
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS})
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
 IF(${MACHINE} STREQUAL WINDOWS)
   SET_TARGET_PROPERTIES(_libNOTIFICATION PROPERTIES DEBUG_OUTPUT_NAME _libNOTIFICATION_d)
diff --git a/src/NamingService/CMakeLists.txt b/src/NamingService/CMakeLists.txt
index f7d2c47e5..8c4f84529 100755
--- a/src/NamingService/CMakeLists.txt
+++ b/src/NamingService/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
diff --git a/src/NamingService/Test/CMakeLists.txt b/src/NamingService/Test/CMakeLists.txt
index a41a34104..cbdd068ea 100755
--- a/src/NamingService/Test/CMakeLists.txt
+++ b/src/NamingService/Test/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${CPPUNIT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
diff --git a/src/Notification/CMakeLists.txt b/src/Notification/CMakeLists.txt
index b0c0ce6d9..424412de4 100755
--- a/src/Notification/CMakeLists.txt
+++ b/src/Notification/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
@@ -39,7 +39,7 @@ SET(SalomeNotification_SOURCES
   NOTIFICATION_Consumer.cxx
 )
 
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS})
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
 ADD_LIBRARY(SalomeNotification ${SalomeNotification_SOURCES}) 
 TARGET_LINK_LIBRARIES(SalomeNotification ${COMMON_LIBS})
diff --git a/src/Registry/CMakeLists.txt b/src/Registry/CMakeLists.txt
index f0261afe2..9a8fbc761 100755
--- a/src/Registry/CMakeLists.txt
+++ b/src/Registry/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
diff --git a/src/ResourcesManager/CMakeLists.txt b/src/ResourcesManager/CMakeLists.txt
index 40ced58f4..8387ebe8d 100755
--- a/src/ResourcesManager/CMakeLists.txt
+++ b/src/ResourcesManager/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${LIBXML2_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
@@ -46,7 +46,7 @@ SET(ResourcesManager_SOURCES
     ResourcesManager.cxx
 )
 
-ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${LIBXML2_DEFINITIONS} ${PLATFORM_DEFINITIONS})
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${LIBXML2_DEFINITIONS})
 
 ADD_LIBRARY(ResourcesManager ${ResourcesManager_SOURCES})
 TARGET_LINK_LIBRARIES(ResourcesManager SALOMEBasics OpUtil ${LIBXML2_LIBRARIES})
diff --git a/src/SALOMEDS/CMakeLists.txt b/src/SALOMEDS/CMakeLists.txt
index 7f78692b0..1c7e51649 100755
--- a/src/SALOMEDS/CMakeLists.txt
+++ b/src/SALOMEDS/CMakeLists.txt
@@ -18,10 +18,10 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
-  ${Boost_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
diff --git a/src/SALOMEDS/Test/CMakeLists.txt b/src/SALOMEDS/Test/CMakeLists.txt
index 71df2dee8..7fd3f5fe4 100755
--- a/src/SALOMEDS/Test/CMakeLists.txt
+++ b/src/SALOMEDS/Test/CMakeLists.txt
@@ -20,7 +20,8 @@
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
-  ${Boost_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
diff --git a/src/SALOMEDSClient/CMakeLists.txt b/src/SALOMEDSClient/CMakeLists.txt
index 9e4ea8ab1..c27a25c2c 100755
--- a/src/SALOMEDSClient/CMakeLists.txt
+++ b/src/SALOMEDSClient/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${Boost_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${PROJECT_BINARY_DIR}/idl
 )
diff --git a/src/SALOMEDSImpl/CMakeLists.txt b/src/SALOMEDSImpl/CMakeLists.txt
index 15a115d3e..ca25fb1df 100755
--- a/src/SALOMEDSImpl/CMakeLists.txt
+++ b/src/SALOMEDSImpl/CMakeLists.txt
@@ -18,9 +18,9 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
-  ${HDF5_INCLUDE_DIRS}
-  ${Boost_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
+  ${HDF5_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
@@ -30,8 +30,7 @@ INCLUDE_DIRECTORIES(
 )
 
 # This local variable defines the list of FLAGS common to all target in this package.
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${BOOST_DEFINITIONS})
-
+ADD_DEFINITIONS(${BOOST_DEFINITIONS})
 # This local variable defines the list of dependant libraries common to all target in this package.  
 SET(COMMON_LIBS
   SALOMEBasics
diff --git a/src/SALOMEDSImpl/Test/CMakeLists.txt b/src/SALOMEDSImpl/Test/CMakeLists.txt
index 37c331af6..3e8ba7ec6 100755
--- a/src/SALOMEDSImpl/Test/CMakeLists.txt
+++ b/src/SALOMEDSImpl/Test/CMakeLists.txt
@@ -19,8 +19,9 @@
 
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
-  ${Boost_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
diff --git a/src/SALOMELocalTrace/CMakeLists.txt b/src/SALOMELocalTrace/CMakeLists.txt
index 00af50a84..f352eb339 100755
--- a/src/SALOMELocalTrace/CMakeLists.txt
+++ b/src/SALOMELocalTrace/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE_DIRECTORIES(
   ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
 )
 
 SET(COMMON_HEADERS
diff --git a/src/SALOMELocalTrace/Test/CMakeLists.txt b/src/SALOMELocalTrace/Test/CMakeLists.txt
index 32da76427..9a076573c 100755
--- a/src/SALOMELocalTrace/Test/CMakeLists.txt
+++ b/src/SALOMELocalTrace/Test/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
diff --git a/src/SALOMETraceCollector/CMakeLists.txt b/src/SALOMETraceCollector/CMakeLists.txt
index 85da79426..a500ed3c1 100755
--- a/src/SALOMETraceCollector/CMakeLists.txt
+++ b/src/SALOMETraceCollector/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
diff --git a/src/SALOMETraceCollector/Test/CMakeLists.txt b/src/SALOMETraceCollector/Test/CMakeLists.txt
index aab133700..8accd1502 100755
--- a/src/SALOMETraceCollector/Test/CMakeLists.txt
+++ b/src/SALOMETraceCollector/Test/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
@@ -35,7 +36,7 @@ SET(COMMON_LIBS
   ${CPPUNIT_LIBRARIES}
 )
 
-ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS})
+ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS})
 
 ADD_LIBRARY(SALOMETraceCollectorTest SALOMETraceCollectorTest.cxx)
 TARGET_LINK_LIBRARIES(SALOMETraceCollectorTest ${COMMON_LIBS})
diff --git a/src/TOOLSDS/CMakeLists.txt b/src/TOOLSDS/CMakeLists.txt
index 6109bc945..ddf23a0a0 100755
--- a/src/TOOLSDS/CMakeLists.txt
+++ b/src/TOOLSDS/CMakeLists.txt
@@ -20,8 +20,8 @@
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${HDF5_INCLUDE_DIRS}
-  ${PTHREAD_INCLUDE_DIRS}
-  ${Boost_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
diff --git a/src/TestContainer/CMakeLists.txt b/src/TestContainer/CMakeLists.txt
index 0ef35ef57..a8b3ed9e7 100755
--- a/src/TestContainer/CMakeLists.txt
+++ b/src/TestContainer/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${OMNIORB_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt
index 7c0d74b34..ea29a0753 100755
--- a/src/UnitTests/CMakeLists.txt
+++ b/src/UnitTests/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics/Test
diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt
index 769f2ce87..7c089dd2f 100755
--- a/src/Utils/CMakeLists.txt
+++ b/src/Utils/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${PROJECT_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
diff --git a/src/Utils/Test/CMakeLists.txt b/src/Utils/Test/CMakeLists.txt
index 5c1c9a612..160b47e86 100755
--- a/src/Utils/Test/CMakeLists.txt
+++ b/src/Utils/Test/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PTHREAD_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${CPPUNIT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
@@ -47,7 +47,6 @@ TARGET_LINK_LIBRARIES(UtilsTest ${COMMON_LIBS} )
 INSTALL(TARGETS UtilsTest DESTINATION ${SALOME_INSTALL_LIBS})
 
 ADD_EXECUTABLE(TestUtils TestUtils.cxx)
-SET_TARGET_PROPERTIES(TestUtils PROPERTIES COMPILE_FLAGS "${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
 TARGET_LINK_LIBRARIES(TestUtils ${COMMON_LIBS} UtilsTest ${OMNIORB_LIBRARIES})
 INSTALL(TARGETS TestUtils DESTINATION ${SALOME_INSTALL_BINS})