msvc compile patch

diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt
index 7f5752e09d253e8db37fd37368af8f334c48bbc2..9c0da9e705dd4136eaef734737a4af86ad5d1f86 100644 (file)
--- 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 d9798b5e0979ccf580d5a38f020e8db8207612c4..4f9573b480638dd58deb12e121d4cdaef927168d 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_ImageImport.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ImageImport.h
@@ -23,7 +23,7 @@
 #include <GeomAPI_Shape.h>
 
 #include <string>
-
+#include <QPixmap>
 /// Implementation of the import STL files algorithms
 GEOMALGOAPI_EXPORT
 std::shared_ptr<GeomAPI_Shape>  ImageImport(const std::string& theFileName,

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
index f9c2811ebc2be6fd740d54389777ec6cfa6def56..5ad2e78acd2b1846aa1c0619fd722c0da57260a9 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.h
@@ -26,6 +26,9 @@
 #include <GeomAPI_Vertex.h>
 #include <map>
 #include <set>
+#ifdef WIN32
+ #include<array>
+#endif WIN32
 
 class GeomAPI_Ax1;
 class GeomAPI_Edge;

diff --git a/src/ModelAPI/ModelAPI_ResultConstruction.h b/src/ModelAPI/ModelAPI_ResultConstruction.h
index 117a8090cf97001637076e31ea3ae8f1d78e122d..9f43462469d891c99d4bce7c90dac69c759d902d 100644 (file)
--- 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 d158d3470a1dd3c72cb080ddcbd64ccdebd844ae..ea185164e1099576075c32bab9de4136966d8796 100644 (file)
--- 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}