Preparation of the SALOME7.2.0 win32 version.

diff --git a/src/Basics/CMakeLists.txt b/src/Basics/CMakeLists.txt
index cf6ec1cc66a46aa985a76f9f0ddc6e81c4502f46..f5cfe737671690fcda8269c9af616c7b0b3e4001 100755 (executable)
--- a/src/Basics/CMakeLists.txt
+++ b/src/Basics/CMakeLists.txt
@@ -17,6 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE_DIRECTORIES(
+  ${PTHREAD_INCLUDE_DIRS}
+)
+
 SET(SALOMEBasics_SOURCES
   BasicsGenericDestructor.cxx
   Basics_Utils.cxx

diff --git a/src/Logger/CMakeLists.txt b/src/Logger/CMakeLists.txt
index e1a97e984d20a69fb7dc7595ee7ed3cf94fb0e4a..2d2351c94e1b654fee03806f6eead1b1d6389ba4 100755 (executable)
--- a/src/Logger/CMakeLists.txt
+++ b/src/Logger/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace

diff --git a/src/SALOMEDSClient/CMakeLists.txt b/src/SALOMEDSClient/CMakeLists.txt
index 15700b0ba80bba56d46304b7415a5e5d7e63ec36..011b34f1b7391d6bd3349f29813a479fb13d2eea 100755 (executable)
--- a/src/SALOMEDSClient/CMakeLists.txt
+++ b/src/SALOMEDSClient/CMakeLists.txt
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
 ADD_LIBRARY(SalomeDSClient SALOMEDSClient_ClientFactory.cxx)
-TARGET_LINK_LIBRARIES(SalomeDSClient SalomeIDLKernel)
+TARGET_LINK_LIBRARIES(SalomeDSClient SalomeIDLKernel ${PLATFORM_LIBS})
 INSTALL(TARGETS SalomeDSClient DESTINATION ${KERNEL_salomelib_LIBS})
 
 FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")

diff --git a/src/SALOMELocalTrace/CMakeLists.txt b/src/SALOMELocalTrace/CMakeLists.txt
index 4a7259b1f0b6acc4ccf4113001cd92f02e2525bc..9e4fc7db167bf9a463289928370101996cf64720 100755 (executable)
--- a/src/SALOMELocalTrace/CMakeLists.txt
+++ b/src/SALOMELocalTrace/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../Basics
+  ${PTHREAD_INCLUDE_DIRS}
 )
 
 SET(COMMON_HEADERS

diff --git a/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx b/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx
index 094f65d428fd170168b3d070f3683b74c219d747..6d8a08a854778758bbb802b7b91608d911049d50 100644 (file)
--- a/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx
+++ b/src/SALOMELocalTrace/Test/SALOMELocalTraceTest.cxx
@@ -190,7 +190,7 @@ void *PrintHello(void *threadid)
         << " - iter " << i);
 #endif
   pthread_exit(NULL);
-  #ifdef WIN32\r
-    return NULL;\r
+  #ifdef WIN32
+    return NULL;
   #endif
 }

diff --git a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
index 3c9758f02325fda7353f952805ee75f1f186edf8..9f195a92bb9db95a971ffb457c2fac8fd5c5ee61 100644 (file)
--- a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
+++ b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
@@ -113,7 +113,7 @@ void *PrintHello(void *threadid)
                 << " - iter " << i);
 #endif
   pthread_exit(NULL);
-  #ifdef WIN32\r
-    return NULL;\r
+  #ifdef WIN32
+    return NULL;
   #endif
 }