From 1e06d55e5ca7dd930512a9ae565497f81ddb6b72 Mon Sep 17 00:00:00 2001 From: rraphael Date: Tue, 8 Dec 2020 16:42:18 +0100 Subject: [PATCH] msvc compile patch --- src/GeomAlgoAPI/CMakeLists.txt | 1 + src/GeomAlgoAPI/GeomAlgoAPI_ImageImport.h | 2 +- src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h | 3 +++ src/ModelAPI/ModelAPI_ResultConstruction.h | 4 ++-- src/PartSet/CMakeLists.txt | 5 +++-- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt index 7f5752e09..9c0da9e70 100644 --- a/src/GeomAlgoAPI/CMakeLists.txt +++ b/src/GeomAlgoAPI/CMakeLists.txt @@ -169,6 +169,7 @@ SET(PROJECT_LIBRARIES ${OpenCASCADE_DataExchange_LIBRARIES} ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${OpenCASCADE_ApplicationFramework_LIBRARIES} + ${QT_LIBRARIES} ) ADD_DEFINITIONS(-DGEOMALGOAPI_EXPORTS ${OpenCASCADE_DEFINITIONS}) diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ImageImport.h b/src/GeomAlgoAPI/GeomAlgoAPI_ImageImport.h index d9798b5e0..4f9573b48 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ImageImport.h +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ImageImport.h @@ -23,7 +23,7 @@ #include #include - +#include /// Implementation of the import STL files algorithms GEOMALGOAPI_EXPORT std::shared_ptr ImageImport(const std::string& theFileName, diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h index f9c2811eb..5ad2e78ac 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h @@ -26,6 +26,9 @@ #include #include #include +#ifdef WIN32 + #include +#endif WIN32 class GeomAPI_Ax1; class GeomAPI_Edge; diff --git a/src/ModelAPI/ModelAPI_ResultConstruction.h b/src/ModelAPI/ModelAPI_ResultConstruction.h index 117a8090c..9f4346246 100644 --- a/src/ModelAPI/ModelAPI_ResultConstruction.h +++ b/src/ModelAPI/ModelAPI_ResultConstruction.h @@ -33,10 +33,10 @@ * Provides a shape that may be displayed in the viewer. * Intermediate, light result that in many cases produces a result on the fly. */ -class ModelAPI_ResultConstruction : public ModelAPI_Result +MODELAPI_EXPORT class ModelAPI_ResultConstruction : public ModelAPI_Result { public: - ModelAPI_ResultConstruction(); + MODELAPI_EXPORT ModelAPI_ResultConstruction(); /// Returns the group identifier of this result MODELAPI_EXPORT virtual std::string groupName(); diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt index d158d3470..ea185164e 100644 --- a/src/PartSet/CMakeLists.txt +++ b/src/PartSet/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE(UseQtExt) INCLUDE_DIRECTORIES(${QT_INCLUDES}) # additional preprocessor / compiler flags -ADD_DEFINITIONS(${QT_DEFINITIONS}) +ADD_DEFINITIONS(${QT_DEFINITIONS} ${OpenCASCADE_DEFINITIONS}) SET(UPDATE_TRANSLATION OFF) @@ -137,6 +137,8 @@ SET(PROJECT_LIBRARIES SketcherPrs ${QT_LIBRARIES} ${OpenCASCADE_FoundationClasses_LIBRARIES} + ${OpenCASCADE_ApplicationFramework_LIBRARIES} + ${OCCViewer} ) # sources / moc wrappings @@ -187,7 +189,6 @@ ELSE(${HAVE_SALOME}) INCLUDE_DIRECTORIES(${APPELEMENTS_INCLUDE_DIR}) ENDIF(${HAVE_SALOME}) - ADD_DEFINITIONS(-DPARTSET_EXPORTS ${OpenCASCADE_DEFINITIONS}) ADD_LIBRARY(PartSet SHARED ${PROJECT_SOURCES} -- 2.39.2