WIN32 compilation.

This commit is contained in:
rnv 2013-09-17 12:52:41 +00:00
parent f51526667e
commit 824e67eabf
46 changed files with 66 additions and 6 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -140,7 +140,7 @@ GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObjec
if (theObject.IsNull()) return GO._retn(); if (theObject.IsNull()) return GO._retn();
TCollection_AsciiString anEntry; TCollection_AsciiString anEntry;
TDF_Tool::Entry(theObject->GetEntry(), 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(); return GO._retn();
} }

View File

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

View File

@ -377,7 +377,7 @@ GEOM::ListOfGO* GEOM_Object_i::GetDependency()
Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(aSeq->Value(i)); Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(aSeq->Value(i));
if (anObj.IsNull()) continue; if (anObj.IsNull()) continue;
TDF_Tool::Entry(anObj->GetEntry(), anEntry); 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; aList[i-1] = obj;
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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