mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-25 08:50:36 +05:00
WIN32 compilation.
This commit is contained in:
parent
f51526667e
commit
824e67eabf
@ -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
|
||||
|
@ -23,6 +23,7 @@
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CAS_INCLUDE_DIRS}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
# additional preprocessor / compiler flags
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -22,6 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CAS_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CAS_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
)
|
||||
|
@ -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}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
)
|
||||
|
||||
|
@ -23,6 +23,7 @@
|
||||
#ifndef _GEOMUtils_HXX_
|
||||
#define _GEOMUtils_HXX_
|
||||
|
||||
#include <Standard_Macro.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Vertex.hxx>
|
||||
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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>
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -22,6 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CAS_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -37,7 +37,8 @@ SET(_link_LIBRARIES
|
||||
vtkFiltersCore
|
||||
${CAS_KERNEL}
|
||||
${CAS_TKMesh} ${CAS_TKTopAlgo}
|
||||
${KERNEL_SALOMELocalTrace}
|
||||
${CAS_MODELER}
|
||||
${KERNEL_SALOMELocalTrace}
|
||||
)
|
||||
|
||||
# --- headers ---
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
)
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CAS_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
)
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
# additional include directories
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CAS_INCLUDE_DIRS}
|
||||
${PTHREAD_INCLUDE_DIR}
|
||||
${KERNEL_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -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}
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user