WIN32 compilation.

idl/CMakeLists.txt

@@ -25,6 +25,11 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+IF(WINDOWS)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WINDOWS)
+
+
 SET(SalomeIDLGEOM_IDLSOURCES
   GEOM_Gen.idl
   GEOM_Superv.idl

src/ARCHIMEDE/CMakeLists.txt

@@ -23,6 +23,7 @@
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   )
 
 # additional preprocessor / compiler flags

src/AdvancedEngine/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/GEOMImpl

src/AdvancedGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/BREPExport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

src/BREPImport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

src/BasicGUI/CMakeLists.txt

@@ -24,6 +24,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/BlockFix/CMakeLists.txt

@@ -23,6 +23,7 @@
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   )
 
@@ -34,7 +35,8 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${CAS_KERNEL}
-  ${CAS_TKOffset} ${CAS_TKBool} ${CAS_BO}
+  ${CAS_TKOffset} ${CAS_TKBool} ${CAS_TKBO}
+  ${CAS_TKShHealing}
   ${KERNEL_SALOMELocalTrace}
   )
 

src/BlocksGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/BooleanGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/BuildGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/DisplayGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/EntityGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/GEOM/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/SKETCHER
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -35,6 +36,9 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${CAS_OCAFVIS}
+  ${CAS_TKLCAF}
+  ${CAS_TKCDF}
+  ${CAS_TKG3d}
   ${KERNEL_SALOMELocalTrace}
   GEOMSketcher
   )

src/GEOMAlgo/CMakeLists.txt

@@ -33,7 +33,7 @@ ADD_DEFINITIONS(
 
 # libraries to link to
 SET(_link_LIBRARIES
-  ${CAS_KERNEL} ${CAS_TKBool} ${CAS_BO} ${CAS_TKMesh}
+  ${CAS_KERNEL} ${CAS_TKBool} ${CAS_TKBO} ${CAS_TKMesh}
   ${KERNEL_SALOMELocalTrace}
   )
 

src/GEOMBase/CMakeLists.txt

@@ -24,6 +24,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/GEOMClient/CMakeLists.txt

@@ -23,6 +23,7 @@
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
   ${CMAKE_CURRENT_SOURCE_DIR}

src/GEOMFiltersSelection/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${GUI_INCLUDE_DIRS}

src/GEOMGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/GEOMImpl/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PYTHON_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/ShHealOper
@@ -43,6 +44,7 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${CAS_TKFeat}
+  ${CAS_TKFillet}
   ${PYTHON_LIBRARIES}
   ShHealOper GEOMbasic BlockFix GEOMAlgo GEOMUtils GEOMSketcher GEOMArchimede
   ${KERNEL_SALOMELocalTrace}

src/GEOMImpl/GEOM_GEOMImpl.hxx

@@ -28,7 +28,7 @@
 #define _GEOM_GEOMImpl_HXX_
 
 #ifdef WNT
- #if defined GEOMIMPL_EXPORTS || defined GEOMimpl_EXPORTS
+ #if defined GEOMIMPL_EXPORTS || defined GEOMImpl_EXPORTS
   #if defined WIN32
    #define GEOMIMPL_EXPORT __declspec( dllexport )
   #else

src/GEOMToolsGUI/CMakeLists.txt

@@ -24,6 +24,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/GEOMUtils/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   )
@@ -34,6 +35,9 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${CAS_TKBRep} ${CAS_TKShHealing} ${CAS_TKMesh}
+  ${CAS_TKTopAlgo}
+  ${CAS_TKG2d}
+  ${CAS_TKG3d}
   ${KERNEL_SALOMELocalTrace}
   )
 

src/GEOMUtils/GEOMUtils.hxx

@@ -23,6 +23,7 @@
 #ifndef _GEOMUtils_HXX_
 #define _GEOMUtils_HXX_
 
+#include <Standard_Macro.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
 

src/GEOM_I/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/GEOMImpl
@@ -38,6 +39,7 @@ ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
   )
 
+
 # libraries to link to
 SET(_link_LIBRARIES
   GEOMImpl

src/GEOM_I/GEOM_IOperations_i.cc

@@ -140,7 +140,7 @@ GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObjec
   if (theObject.IsNull()) return GO._retn();
   TCollection_AsciiString anEntry;
   TDF_Tool::Entry(theObject->GetEntry(), anEntry);
-  GO = _engine->GetObject(theObject->GetDocID(), anEntry.ToCString());
+  GO = _engine->GetObject(theObject->GetDocID(), (char*) anEntry.ToCString());
   return GO._retn();
 }
 

src/GEOM_I/GEOM_IShapesOperations_i.hh

@@ -23,6 +23,7 @@
 #ifndef _GEOM_IShapesOperations_i_HeaderFile
 #define _GEOM_IShapesOperations_i_HeaderFile
 
+#include "GEOM_GEOM_I.hxx"
 #include "GEOMImpl_Gen.hxx"
 
 #include <SALOMEconfig.h>

src/GEOM_I/GEOM_Object_i.cc

@@ -377,7 +377,7 @@ GEOM::ListOfGO* GEOM_Object_i::GetDependency()
     Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(aSeq->Value(i));
     if (anObj.IsNull()) continue;
     TDF_Tool::Entry(anObj->GetEntry(), anEntry);
-    GEOM::GEOM_Object_var obj = _engine->GetObject(anObj->GetDocID(), anEntry.ToCString());
+    GEOM::GEOM_Object_var obj = _engine->GetObject(anObj->GetDocID(), (char*) anEntry.ToCString());
     aList[i-1] = obj;
   }
 

src/GEOM_I_Superv/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
   ${CMAKE_CURRENT_SOURCE_DIR}

src/GEOM_SWIG_WITHIHM/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/GenerationGUI/CMakeLists.txt

@@ -24,6 +24,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/GroupGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/IGESExport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

src/IGESImport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 
@@ -33,6 +34,7 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${CAS_TKIGES} ${CAS_TKCAF}
+  ${CAS_TKLCAF}
   ${KERNEL_SALOMELocalTrace}
   )
 

src/MeasureGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/OBJECT/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${VTK_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${VTK_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${QT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/OCC2VTK/CMakeLists.txt

@@ -37,6 +37,7 @@ SET(_link_LIBRARIES
   vtkFiltersCore
   ${CAS_KERNEL} 
   ${CAS_TKMesh} ${CAS_TKTopAlgo}
+  ${CAS_MODELER}
   ${KERNEL_SALOMELocalTrace}   
   )
 

src/OperationGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/PrimitiveGUI/CMakeLists.txt

@@ -24,6 +24,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/RepairGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/SKETCHER/CMakeLists.txt

@@ -23,6 +23,7 @@
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   )
 
 # additional preprocessor / compiler flags
@@ -34,6 +35,8 @@ ADD_DEFINITIONS(
 SET(_link_LIBRARIES
   ${CAS_KERNEL} 
   ${CAS_TKGeomAlgo} ${CAS_TKTopAlgo}
+  ${CAS_TKBRep}
+  ${CAS_TKG2d}
   ${KERNEL_SALOMELocalTrace}
   )
 

src/STEPExport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

src/STEPImport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 
@@ -33,6 +34,8 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   ${CAS_TKSTEP} ${CAS_TKCAF}
+  ${CAS_TKLCAF}
+  ${CAS_TKSTEPBase}
   ${KERNEL_SALOMELocalTrace}
   )
 

src/STLExport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

src/TransformationGUI/CMakeLists.txt

@@ -25,6 +25,7 @@ INCLUDE(${QT_USE_FILE})
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
   ${CAS_INCLUDE_DIRS}

src/VTKExport/CMakeLists.txt

@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${VTK_INCLUDE_DIRS}
   ${PROJECT_SOURCE_DIR}/src/OCC2VTK