From: rnv <rnv@opencascade.com>
Date: Mon, 24 Jun 2013 08:13:04 +0000 (+0000)
Subject: Preparation of the SALOME7.2.0 win32 version.
X-Git-Tag: V7_2_0_WIN~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c4bd45d077ad27e36c1b7596632f809f3ba55648;p=modules%2Fkernel.git

Preparation of the SALOME7.2.0 win32 version.
---

diff --git a/src/Basics/CMakeLists.txt b/src/Basics/CMakeLists.txt
index cf6ec1cc6..f5cfe7376 100755
--- 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 e1a97e984..2d2351c94 100755
--- 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 15700b0ba..011b34f1b 100755
--- 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 4a7259b1f..9e4fc7db1 100755
--- 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 094f65d42..6d8a08a85 100644
--- 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
-    return NULL;
+  #ifdef WIN32
+    return NULL;
   #endif
 }
diff --git a/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx b/src/SALOMETraceCollector/Test/SALOMETraceCollectorTest.cxx
index 3c9758f02..9f195a92b 100644
--- 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
-    return NULL;
+  #ifdef WIN32
+    return NULL;
   #endif
 }