update of HYDRO code for Windows compilation

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index cedf6566b75e1f5665e6e8aa7eed9af6b57bdba1..0e7747d45a8e15ceed0e426dec8db7f06df8cc4c 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -20,4 +20,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_SUBDIRECTORY(salome)
+IF(WIN32)
+ELSE(WIN32)
+  ADD_SUBDIRECTORY(salome)
+ENDIF(WIN32)

diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index de46bb1273d9d198f0e7b65e310e687eb436e452..7042b8d06db4731f66b1c9ab1a60c16c27a1b02a 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -414,7 +414,7 @@ protected:
 
 public:
 
-   virtual bool CompareLabels(const Handle(HYDROData_Entity)& theOtherObj);
+   HYDRODATA_EXPORT virtual bool CompareLabels(const Handle(HYDROData_Entity)& theOtherObj);
   
 protected:
 

diff --git a/src/HYDROData/HYDROData_IProfilesInterpolator.h b/src/HYDROData/HYDROData_IProfilesInterpolator.h
index 1bbc4754a18f5c992d172171680c6d92f2407e31..fa0b3eca2127475dc91d99ab9082310c01e6efe8 100644 (file)
--- a/src/HYDROData/HYDROData_IProfilesInterpolator.h
+++ b/src/HYDROData/HYDROData_IProfilesInterpolator.h
@@ -27,8 +27,7 @@
 #include <string>
 #include <vector>
 #include <map>
-
-class gp_XYZ;
+#include <gp_XYZ.hxx>
 
 
 /**

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index ae4abb616fe649774b2e4e3213100b9ee11cdf59..1a6f2cf8a01490268f91962bcb3852a42fe45a93 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -67,28 +67,28 @@ IF( ${WIN32} )
   add_definitions( -DWNT -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4 )
 ENDIF()
 
-SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT}/include )
+SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
 SET( CAS_INCLUDES $ENV{CASROOT}/inc )
-SET( QT_INCLUDES $ENV{QTDIR}/include $ENV{QTDIR}/include/QtCore $ENV{QTDIR}/include/QtGui $ENV{QTDIR}/include/QtTest )
+SET( QT_INCLUDES $ENV{QT_ROOT_DIR}/include $ENV{QT_ROOT_DIR}/include/QtCore $ENV{QT_ROOT_DIR}/include/QtGui $ENV{QT_ROOT_DIR}/include/QtTest )
 SET( KERNEL_INCLUDES $ENV{KERNEL_ROOT_DIR}/include/salome )
 SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
 SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 
 IF( ${WIN32} )
-  link_directories( $ENV{CASROOT}/win32/libd )
+  link_directories( $ENV{CASROOT}/win64/vc10/lib )
 ELSE()
   link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
 ENDIF()
 SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh )
 
-link_directories( $ENV{QTDIR}/lib )
+link_directories( $ENV{QT_ROOT_DIR}/lib )
 IF( ${WIN32} )
-  SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
+  SET( QT_LIBRARIES Qt5Cored Qt5Guid Qt5Testd )
 ELSE()
   SET( QT_LIBRARIES QtCore QtGui QtTest )
 ENDIF()
 
-link_directories( $ENV{CPPUNIT_ROOT}/lib )
+link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
 IF( ${WIN32} )
   SET( CPPUNIT_LIBRARIES cppunitd )
 ELSE()