correct compilation on Linux

diff --git a/src/HYDROData/HYDROData_Tool.cxx b/src/HYDROData/HYDROData_Tool.cxx
index 404e19aa44a688de5ada8e1e5d67d511cfbc3d06..e9fef89f472746aa02041461025a3df2fbaf03f2 100644 (file)
--- a/src/HYDROData/HYDROData_Tool.cxx
+++ b/src/HYDROData/HYDROData_Tool.cxx
@@ -38,6 +38,7 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Wire.hxx>
+#include <limits>
 
 static int aMaxNameId = std::numeric_limits<int>::max();
 

diff --git a/src/HYDROData/HYDROData_Tool.h b/src/HYDROData/HYDROData_Tool.h
index 761f9ec86e7134db9010be51f1ce817948647db2..db72e3ff984bb21994d3075611a1452ebbf37531 100644 (file)
--- a/src/HYDROData/HYDROData_Tool.h
+++ b/src/HYDROData/HYDROData_Tool.h
@@ -31,7 +31,11 @@ class gp_XY;
 class QColor;
 class QFile;
 class TCollection_ExtendedString;
-enum TopAbs_State;
+#ifdef WIN32
+  enum TopAbs_State;
+#else
+  #include <TopAbs_State.hxx>
+#endif
 class TopoDS_Edge;
 class TopoDS_Face;
 class TopoDS_Shape;

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index bad929033fea1996e15bc3c860c429b8aeec7532..c7179cdd5bb7a23e5b63f202c7bd372667b73473 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -46,20 +46,33 @@ ENDIF()
 
 SET( BOOST_INCLUDES $ENV{BOOST_ROOT_DIR}/include/boost-1_52 )
 SET( CPPUNIT_INCLUDES $ENV{CPPUNIT_ROOT_DIR}/include )
-SET( QT_INCLUDES $ENV{QT_ROOT_DIR}/include $ENV{QT_ROOT_DIR}/include/QtCore $ENV{QT_ROOT_DIR}/include/QtGui )
+SET( CAS_INCLUDES $ENV{CASROOT_DIR}/inc )
+SET( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_ROOT_DIR}/include/QtGui )
 SET( GUI_INCLUDES $ENV{GUI_ROOT_DIR}/include/salome )
 
-link_directories( $ENV{CAS_ROOT_DIR}/win32/libd )  #TODO: more correct for release, linux etc
+IF( ${WIN32} )
+  link_directories( $ENV{CAS_ROOT_DIR}/win32/libd )
+ELSE()
+  link_directories( $ENV{CAS_ROOT_DIR}/lib )
+ENDIF()
 SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d )
 
-link_directories( $ENV{QT_ROOT_DIR}/lib )
-SET( QT_LIBRARIES QtCored4 QtGuid4 )
+link_directories( $ENV{QT4_ROOT_DIR}/lib )
+IF( ${WIN32} )
+  SET( QT_LIBRARIES QtCored4 QtGuid4 )
+ELSE()
+  SET( QT_LIBRARIES QtCore QtGui )
+ENDIF()
 
 link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
-SET( CPPUNIT_LIBRARIES cppunitd )
+IF( ${WIN32} )
+  SET( CPPUNIT_LIBRARIES cppunitd )
+ELSE()
+  SET( CPPUNIT_LIBRARIES cppunit )
+ENDIF()
 
 link_directories( $ENV{GUI_ROOT_DIR}/lib/salome )
-SET( GUI_LIBRARIES ImageComposer Qtx SUIT LightApp CAM OCCViewer )
+SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
 
 include_directories(
   ${BOOST_INCLUDES}