From 824e67eabf31204b2bb910e52d7f9e8e1eab140c Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 17 Sep 2013 12:52:41 +0000 Subject: [PATCH] WIN32 compilation. --- idl/CMakeLists.txt | 5 +++++ src/ARCHIMEDE/CMakeLists.txt | 1 + src/AdvancedEngine/CMakeLists.txt | 1 + src/AdvancedGUI/CMakeLists.txt | 1 + src/BREPExport/CMakeLists.txt | 1 + src/BREPImport/CMakeLists.txt | 1 + src/BasicGUI/CMakeLists.txt | 1 + src/BlockFix/CMakeLists.txt | 4 +++- src/BlocksGUI/CMakeLists.txt | 1 + src/BooleanGUI/CMakeLists.txt | 1 + src/BuildGUI/CMakeLists.txt | 1 + src/DisplayGUI/CMakeLists.txt | 1 + src/EntityGUI/CMakeLists.txt | 1 + src/GEOM/CMakeLists.txt | 4 ++++ src/GEOMAlgo/CMakeLists.txt | 2 +- src/GEOMBase/CMakeLists.txt | 1 + src/GEOMClient/CMakeLists.txt | 1 + src/GEOMFiltersSelection/CMakeLists.txt | 1 + src/GEOMGUI/CMakeLists.txt | 1 + src/GEOMImpl/CMakeLists.txt | 2 ++ src/GEOMImpl/GEOM_GEOMImpl.hxx | 2 +- src/GEOMToolsGUI/CMakeLists.txt | 1 + src/GEOMUtils/CMakeLists.txt | 4 ++++ src/GEOMUtils/GEOMUtils.hxx | 1 + src/GEOM_I/CMakeLists.txt | 2 ++ src/GEOM_I/GEOM_IOperations_i.cc | 2 +- src/GEOM_I/GEOM_IShapesOperations_i.hh | 1 + src/GEOM_I/GEOM_Object_i.cc | 2 +- src/GEOM_I_Superv/CMakeLists.txt | 1 + src/GEOM_SWIG_WITHIHM/CMakeLists.txt | 1 + src/GenerationGUI/CMakeLists.txt | 1 + src/GroupGUI/CMakeLists.txt | 1 + src/IGESExport/CMakeLists.txt | 1 + src/IGESImport/CMakeLists.txt | 2 ++ src/MeasureGUI/CMakeLists.txt | 1 + src/OBJECT/CMakeLists.txt | 1 + src/OCC2VTK/CMakeLists.txt | 3 ++- src/OperationGUI/CMakeLists.txt | 1 + src/PrimitiveGUI/CMakeLists.txt | 1 + src/RepairGUI/CMakeLists.txt | 1 + src/SKETCHER/CMakeLists.txt | 3 +++ src/STEPExport/CMakeLists.txt | 1 + src/STEPImport/CMakeLists.txt | 3 +++ src/STLExport/CMakeLists.txt | 1 + src/TransformationGUI/CMakeLists.txt | 1 + src/VTKExport/CMakeLists.txt | 1 + 46 files changed, 66 insertions(+), 6 deletions(-) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 692807b50..3f93f4c2a 100755 --- 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 7537b4f22..178c511f2 100755 --- 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 987369075..edac549f7 100755 --- 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 b9df1acae..a4af292d2 100755 --- 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 db6f49ff7..6ed9f3bd0 100755 --- 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 b288b6877..8fc4597e8 100755 --- 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 183950969..d36777d4a 100755 --- 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 b63980fbf..47bab2dee 100755 --- 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 dc0c705ee..26a87b41d 100755 --- 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 c604eb0e2..e50346ec0 100755 --- 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 eaa4d3a66..dcd1e89d2 100755 --- 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 4014d9ee4..2a18b517c 100755 --- 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 bcbca2b69..31c381aac 100755 --- 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 c5bbf9823..d71cf0967 100755 --- 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 67804a84a..f9726910a 100755 --- 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 5a701c2ab..2e000a11e 100755 --- 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 5cdbf6b5b..e38469bd0 100755 --- 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 8676e65e9..621017c1c 100755 --- 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 f69a8d1ac..ed1bf4cf1 100755 --- 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 315d99d37..71ad0a172 100755 --- 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 b019221ac..7e277ede4 100755 --- 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 7b718482a..a21334078 100755 --- 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 6ca2c5e35..bc8b144d1 100755 --- 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 3b586d693..1b0327e46 100644 --- a/src/GEOMUtils/GEOMUtils.hxx +++ b/src/GEOMUtils/GEOMUtils.hxx @@ -23,6 +23,7 @@ #ifndef _GEOMUtils_HXX_ #define _GEOMUtils_HXX_ +#include #include #include diff --git a/src/GEOM_I/CMakeLists.txt b/src/GEOM_I/CMakeLists.txt index b76838402..3f828e6d9 100755 --- 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 059e751ae..ddb90948f 100644 --- 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 2bc2d335e..723d3a77e 100644 --- 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 diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 2df3c45c6..7bdb0a90d 100644 --- 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 94f1ef3e6..e4d01379a 100755 --- 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 87276c9b1..a44292a7f 100755 --- 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 d3a9891c4..3b7bce552 100755 --- 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 5e71ef216..9fbccfc17 100755 --- 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 f48ab860c..f35435682 100755 --- 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 d51ed59e2..6019e81e7 100755 --- 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 805fc09d5..809520ee8 100755 --- 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 a5a01536e..fb595ae69 100755 --- 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 6f239f071..67ae3bf9d 100755 --- 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 4a11d1bec..059c54a08 100755 --- 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 9c7fb7b39..3629e66b3 100755 --- 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 1e164db82..7d40a3315 100755 --- 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 39f595173..e322ec6a1 100755 --- 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 80c765266..0169291a2 100755 --- 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 27769a27d..461fc73cc 100755 --- 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 4adbd16e2..7bdbb76c1 100755 --- 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 658cc3ab1..4a1621a41 100755 --- 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 eac70b5a6..0772b0b13 100755 --- 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