WIN32 compilation.

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 692807b50a25196a5d443c87f90491790f00467e..3f93f4c2a7e40e6abf33dc4346bad4d51beb432c 100755 (executable)
--- a/idl/CMakeLists.txt
+++ b/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

diff --git a/src/ARCHIMEDE/CMakeLists.txt b/src/ARCHIMEDE/CMakeLists.txt
index 7537b4f22ecb7c7a87181f61abcd3e520d852226..178c511f2a2fe52fabcc6d3a7b1b3df0d26f983b 100755 (executable)
--- a/src/ARCHIMEDE/CMakeLists.txt
+++ b/src/ARCHIMEDE/CMakeLists.txt
@@ -23,6 +23,7 @@
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   )
 
 # additional preprocessor / compiler flags

diff --git a/src/AdvancedEngine/CMakeLists.txt b/src/AdvancedEngine/CMakeLists.txt
index 987369075d22554f03c48d340de1b0afdf3c1e04..edac549f711164896147eda132923e0f0b853cc2 100755 (executable)
--- a/src/AdvancedEngine/CMakeLists.txt
+++ b/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

diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt
index b9df1acae94e99b5d5b9b47868b26036c99e1bc7..a4af292d2462cae12d4a179a0a62d4deb774ecf7 100755 (executable)
--- a/src/AdvancedGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/BREPExport/CMakeLists.txt b/src/BREPExport/CMakeLists.txt
index db6f49ff7dbbe17ebb2fb00df1b581f94225ec46..6ed9f3bd07e831ca15ad26f8b5dd55ab99ea7818 100755 (executable)
--- a/src/BREPExport/CMakeLists.txt
+++ b/src/BREPExport/CMakeLists.txt
@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

diff --git a/src/BREPImport/CMakeLists.txt b/src/BREPImport/CMakeLists.txt
index b288b68771ab374d13e6c70b1ce4d4240972579a..8fc4597e803f256875e112d46e555c2b5b32c3d5 100755 (executable)
--- a/src/BREPImport/CMakeLists.txt
+++ b/src/BREPImport/CMakeLists.txt
@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

diff --git a/src/BasicGUI/CMakeLists.txt b/src/BasicGUI/CMakeLists.txt
index 183950969da61ad30059dc0affffa7ec6485cc70..d36777d4ac248bcde9816fdd155fdc33eff8563a 100755 (executable)
--- a/src/BasicGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/BlockFix/CMakeLists.txt b/src/BlockFix/CMakeLists.txt
index b63980fbf6c45d6597f62a970ec8d4c9e41bce90..47bab2deef506a46c5797eef60bd49a80d92ff50 100755 (executable)
--- a/src/BlockFix/CMakeLists.txt
+++ b/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}
   )
 

diff --git a/src/BlocksGUI/CMakeLists.txt b/src/BlocksGUI/CMakeLists.txt
index dc0c705ee70310aaf5740e8e61e190170e46208b..26a87b41d62784af2fa6ef7ffd8e928cbb6a2ccc 100755 (executable)
--- a/src/BlocksGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/BooleanGUI/CMakeLists.txt b/src/BooleanGUI/CMakeLists.txt
index c604eb0e21cfcc71cf8dd1fda3928d805f156ba8..e50346ec041df50a812df8dc68d987c24ed97b39 100755 (executable)
--- a/src/BooleanGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/BuildGUI/CMakeLists.txt b/src/BuildGUI/CMakeLists.txt
index eaa4d3a6643d318988c7a2fa4e8480eb700ed835..dcd1e89d25da230ddaddc8c20e37cc61e0722d44 100755 (executable)
--- a/src/BuildGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/DisplayGUI/CMakeLists.txt b/src/DisplayGUI/CMakeLists.txt
index 4014d9ee4c9f99b29f15d55d004c5ccf85f97118..2a18b517c3a609d4073ca8196fdc874f4d19e60d 100755 (executable)
--- a/src/DisplayGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/EntityGUI/CMakeLists.txt b/src/EntityGUI/CMakeLists.txt
index bcbca2b6965240f50d20c1019b75ff0008ed2058..31c381aac9faafe3762d5fde7225003ea009e4f3 100755 (executable)
--- a/src/EntityGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOM/CMakeLists.txt b/src/GEOM/CMakeLists.txt
index c5bbf98236400140f03801f723243ef95776950b..d71cf09672a60759a109139b791ec739d8ee86e5 100755 (executable)
--- a/src/GEOM/CMakeLists.txt
+++ b/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
   )

diff --git a/src/GEOMAlgo/CMakeLists.txt b/src/GEOMAlgo/CMakeLists.txt
index 67804a84acc1aa76f8ffb8d1d5e772fc4215065e..f9726910a660b1f2db0fe9e8f521fdb0daca59b9 100755 (executable)
--- a/src/GEOMAlgo/CMakeLists.txt
+++ b/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}
   )
 

diff --git a/src/GEOMBase/CMakeLists.txt b/src/GEOMBase/CMakeLists.txt
index 5a701c2ab599eeab917db2b3c118b0de1c6ca6bb..2e000a11e34457f1d2799e48a57f78b11483c679 100755 (executable)
--- a/src/GEOMBase/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOMClient/CMakeLists.txt b/src/GEOMClient/CMakeLists.txt
index 5cdbf6b5b0756ec20fe544ef7ecdfa7231f4d9ba..e38469bd0c6f6aa912a5f7a36e5ed6cc9d93f36a 100755 (executable)
--- a/src/GEOMClient/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOMFiltersSelection/CMakeLists.txt b/src/GEOMFiltersSelection/CMakeLists.txt
index 8676e65e9acffbcdeda8889867fd43a8e16ee845..621017c1c4e9b0dfe9bb59c70ebe900dca392585 100755 (executable)
--- a/src/GEOMFiltersSelection/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt
index f69a8d1acb27854a82a68ec359aa11c90d985280..ed1bf4cf1d64c6b4b4f8e46d6f2f1c331cf3b6ea 100755 (executable)
--- a/src/GEOMGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOMImpl/CMakeLists.txt b/src/GEOMImpl/CMakeLists.txt
index 315d99d376860c347f7e57c8c5c5528e8ea8f374..71ad0a172c41d6aeb0bb4ff55ae9c19b53fb8e7d 100755 (executable)
--- a/src/GEOMImpl/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOMImpl/GEOM_GEOMImpl.hxx b/src/GEOMImpl/GEOM_GEOMImpl.hxx
index b019221acea2396d64c19c48a22473a0a5bced80..7e277ede49b82c59cb10dcb4de3e5f9c40c8b685 100755 (executable)
--- a/src/GEOMImpl/GEOM_GEOMImpl.hxx
+++ b/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

diff --git a/src/GEOMToolsGUI/CMakeLists.txt b/src/GEOMToolsGUI/CMakeLists.txt
index 7b718482a95af3fdb34c7cf4e58bf72b9551f322..a21334078f89c43a87c62c13dbc17e135087e99d 100755 (executable)
--- a/src/GEOMToolsGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOMUtils/CMakeLists.txt b/src/GEOMUtils/CMakeLists.txt
index 6ca2c5e35ae0be056fd62cf2cc153e6995aa7d73..bc8b144d1ede0a09cb8db761c63a9a4ecf0f7b02 100755 (executable)
--- a/src/GEOMUtils/CMakeLists.txt
+++ b/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}
   )
 

diff --git a/src/GEOMUtils/GEOMUtils.hxx b/src/GEOMUtils/GEOMUtils.hxx
index 3b586d69373db59297930cb9775f2914a502d042..1b0327e46644d22b0b2a759c82673a6c8d3310ef 100644 (file)
--- a/src/GEOMUtils/GEOMUtils.hxx
+++ b/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>
 

diff --git a/src/GEOM_I/CMakeLists.txt b/src/GEOM_I/CMakeLists.txt
index b768384026c3fac2ef633d5d59e11baa0c4682e8..3f828e6d9ba198fa4ce2e48258e8f161c4a0e9d3 100755 (executable)
--- a/src/GEOM_I/CMakeLists.txt
+++ b/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

diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc
index 059e751ae5ebb4face84d2e3232ee43adcc22f0c..ddb90948fff925bfd615b17189ad9bcdf2a294c7 100644 (file)
--- a/src/GEOM_I/GEOM_IOperations_i.cc
+++ b/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();
 }
 

diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh
index 2bc2d335e3ec67a07304d5c465c32962eb5c14b4..723d3a77ecf10bfc1b3ba854461ddab0273b4446 100644 (file)
--- a/src/GEOM_I/GEOM_IShapesOperations_i.hh
+++ b/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>

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index 2df3c45c6ec37699f31a6c6f26cfe801a1075591..7bdb0a90d7023d05b75e53c61781f38e5f8b6e52 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/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;
   }
 

diff --git a/src/GEOM_I_Superv/CMakeLists.txt b/src/GEOM_I_Superv/CMakeLists.txt
index 94f1ef3e6ffae686f80ea00064ef27254f81f59c..e4d01379a2c4da994eadb97ce3fd0b4704f5efa9 100755 (executable)
--- a/src/GEOM_I_Superv/CMakeLists.txt
+++ b/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}

diff --git a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt b/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
index 87276c9b105a54f3627a61caf3d546de6ca5ded9..a44292a7ff42d45f114599c98525154218161142 100755 (executable)
--- a/src/GEOM_SWIG_WITHIHM/CMakeLists.txt
+++ b/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}

diff --git a/src/GenerationGUI/CMakeLists.txt b/src/GenerationGUI/CMakeLists.txt
index d3a9891c43f05a99c808c1b39adc0d73c2916503..3b7bce552ea30ca8743b8a92c092e9e36073893c 100755 (executable)
--- a/src/GenerationGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/GroupGUI/CMakeLists.txt b/src/GroupGUI/CMakeLists.txt
index 5e71ef2169ff6eec044d602ef46136144b915e0f..9fbccfc17d5868c3f772199117ea58497df70114 100755 (executable)
--- a/src/GroupGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/IGESExport/CMakeLists.txt b/src/IGESExport/CMakeLists.txt
index f48ab860c06cff62a623f55053aa4b029051fdc9..f354356827e8ad71c436022f4ee802c03ba12745 100755 (executable)
--- a/src/IGESExport/CMakeLists.txt
+++ b/src/IGESExport/CMakeLists.txt
@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

diff --git a/src/IGESImport/CMakeLists.txt b/src/IGESImport/CMakeLists.txt
index d51ed59e2e4c239c6b08be5efa7bcec8365238f9..6019e81e70ac8e9998ab4d46c61824a965ecec6e 100755 (executable)
--- a/src/IGESImport/CMakeLists.txt
+++ b/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}
   )
 

diff --git a/src/MeasureGUI/CMakeLists.txt b/src/MeasureGUI/CMakeLists.txt
index 805fc09d59abe49fd89cd432a46fc476d4d25aa5..809520ee87aca01a02b5fc1c39651586094f1f5f 100755 (executable)
--- a/src/MeasureGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt
index a5a01536ea620df7fd134d9a55eb29039121fcd0..fb595ae69dce24ec668742e1a20b9f4e0585d4db 100755 (executable)
--- a/src/OBJECT/CMakeLists.txt
+++ b/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}

diff --git a/src/OCC2VTK/CMakeLists.txt b/src/OCC2VTK/CMakeLists.txt
index 6f239f071413909691ae80f77c87bd0a1963cd11..67ae3bf9d1193f47b1e2c5fe7ddaa8a7a185fe75 100755 (executable)
--- a/src/OCC2VTK/CMakeLists.txt
+++ b/src/OCC2VTK/CMakeLists.txt
@@ -37,7 +37,8 @@ SET(_link_LIBRARIES
   vtkFiltersCore
   ${CAS_KERNEL} 
   ${CAS_TKMesh} ${CAS_TKTopAlgo}
-  ${KERNEL_SALOMELocalTrace}
+  ${CAS_MODELER}
+  ${KERNEL_SALOMELocalTrace}   
   )
 
 # --- headers ---

diff --git a/src/OperationGUI/CMakeLists.txt b/src/OperationGUI/CMakeLists.txt
index 4a11d1bece983711902c4e0fa45c0df3df4fe148..059c54a08b1e3e42e8fb6e84da7eb2d50299a15f 100755 (executable)
--- a/src/OperationGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/PrimitiveGUI/CMakeLists.txt b/src/PrimitiveGUI/CMakeLists.txt
index 9c7fb7b39ad8c173b141477d8ba01edb98b0c418..3629e66b3753548a6fd8006e0f24249a5fe5946d 100755 (executable)
--- a/src/PrimitiveGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/RepairGUI/CMakeLists.txt b/src/RepairGUI/CMakeLists.txt
index 1e164db820bf87261862e1d71eabd93ed4a223ab..7d40a3315e38aee9382a86ef3d2bc6d44818807c 100755 (executable)
--- a/src/RepairGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/SKETCHER/CMakeLists.txt b/src/SKETCHER/CMakeLists.txt
index 39f5951736c55a849081990bf26890e36fe12ca2..e322ec6a15bded00309e40460048687cabcf814d 100755 (executable)
--- a/src/SKETCHER/CMakeLists.txt
+++ b/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}
   )
 

diff --git a/src/STEPExport/CMakeLists.txt b/src/STEPExport/CMakeLists.txt
index 80c76526688b6c9f04b62eb9e6cf8a35d9573a5c..0169291a2010eff5c77d6384e335a4bf8c5d679c 100755 (executable)
--- a/src/STEPExport/CMakeLists.txt
+++ b/src/STEPExport/CMakeLists.txt
@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

diff --git a/src/STEPImport/CMakeLists.txt b/src/STEPImport/CMakeLists.txt
index 27769a27d50102f441b996a70f0dd123ba55a98f..461fc73ccc940955ec32407fd8588a99fab9fb31 100755 (executable)
--- a/src/STEPImport/CMakeLists.txt
+++ b/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}
   )
 

diff --git a/src/STLExport/CMakeLists.txt b/src/STLExport/CMakeLists.txt
index 4adbd16e2bb967c462f95882e3b68460fe601993..7bdbb76c1eb7a1be3a8bf4facf3ebb2f94351c51 100755 (executable)
--- a/src/STLExport/CMakeLists.txt
+++ b/src/STLExport/CMakeLists.txt
@@ -22,6 +22,7 @@
 # additional include directories
 INCLUDE_DIRECTORIES(
   ${CAS_INCLUDE_DIRS}
+  ${PTHREAD_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   )
 

diff --git a/src/TransformationGUI/CMakeLists.txt b/src/TransformationGUI/CMakeLists.txt
index 658cc3ab1a0ea1ea29c42a34348caf0b448bbc58..4a1621a4156b10c469e9c68dfbf13802a8a69e75 100755 (executable)
--- a/src/TransformationGUI/CMakeLists.txt
+++ b/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}

diff --git a/src/VTKExport/CMakeLists.txt b/src/VTKExport/CMakeLists.txt
index eac70b5a60a469ef2a16481aaefd50c02870e2f3..0772b0b137463268893f953657e4753808482657 100755 (executable)
--- a/src/VTKExport/CMakeLists.txt
+++ b/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