porting on linux

diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index 4b816d8db04ae6591be44cf590584287e59350b3..c582b16fcc4143a2842f97b97fa89f57f3de270b 100644 (file)
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -1286,9 +1286,9 @@ void HYDROData_LandCoverMap::ClassifyPoints( const std::vector<gp_XY>& thePoints
         C1.push_back(theTable->Get( *it, DefValue ));
       double Val;
       if (UseMax)
-        Val = *(std::max_element(std::begin(C1), std::end(C1)));
+        Val = *(std::max_element( C1.begin(), C1.end() ) );
       else
-        Val = *(std::min_element(std::begin(C1), std::end(C1)));
+        Val = *(std::min_element( C1.begin(), C1.end() ) );
       theCoeffs[i] = Val;
     }
   }

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 4d5482b07b0a2e006135eb47c1c04f675fecadb4..0dc66e75aafc8cbe87fbffa745b338b8f558f757 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -60,16 +60,15 @@ set(PROJECT_SOURCES
 )
 
 add_definitions(
-  -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC -D__WIN32__ -D__x86__ -D_WIN64 -D_WIN32_WINNT=0x0400 -D__NT__ -D__OSVERSION__=4
-)
+  -DLIGHT_MODE -DHYDRODATA_STATIC -DHYDROGUI_STATIC )
 
 IF( ${WIN32} )
-  add_definitions( -DWNT )
+  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_DIR}/include )
 SET( CAS_INCLUDES $ENV{CASROOT}/inc )
-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( QT_INCLUDES $ENV{QT4_ROOT_DIR}/include $ENV{QT4_ROOT_DIR}/include/QtCore $ENV{QT4_ROOT_DIR}/include/QtGui $ENV{QT4_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 )
@@ -81,7 +80,7 @@ ELSE()
 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{QT_ROOT_DIR}/lib )
+link_directories( $ENV{QT4_ROOT_DIR}/lib )
 IF( ${WIN32} )
   SET( QT_LIBRARIES QtCored4 QtGuid4 QtTestd4 )
 ELSE()
@@ -97,7 +96,7 @@ ENDIF()
 
 link_directories( $ENV{KERNEL_ROOT_DIR}/lib/salome $ENV{GUI_ROOT_DIR}/lib/salome $ENV{GEOM_ROOT_DIR}/lib/salome )
 SET( GUI_LIBRARIES ImageComposer qtx suit LightApp CAM OCCViewer )
-SET( GEOM_LIBRARIES CurveCreator GeomUtils )
+SET( GEOM_LIBRARIES CurveCreator GEOMUtils )
 
 include_directories(
   ${CAS_INCLUDES}
@@ -120,4 +119,5 @@ target_link_libraries( HYDROData_tests ${GUI_LIBRARIES} ${GEOM_LIBRARIES} ${CAS_
 #  add_custom_command( TARGET HYDROData_tests POST_BUILD COMMAND $(TargetPath) COMMENT "Running tests" )
 #ENDIF()
 
-INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS})
+SET( INSTALL_BINS $ENV{HYDRO_ROOT_DIR}/bin/salome )
+INSTALL(TARGETS HYDROData_tests EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${INSTALL_BINS})

diff --git a/src/HYDRO_tests/ExternalFiles.cmake b/src/HYDRO_tests/ExternalFiles.cmake
index f84b75d56dab5d41f27ae6691674d0f72f027afb..004295c19a0d97e614b5ccdf7ff0e15d0fa0fe1d 100644 (file)
--- a/src/HYDRO_tests/ExternalFiles.cmake
+++ b/src/HYDRO_tests/ExternalFiles.cmake
@@ -55,8 +55,8 @@ set( EXTERNAL_FILES
   ../HYDROData/HYDROData_SinusX.cxx
   ../HYDROData/HYDROData_ShapeFile.cxx
   ../HYDROData/HYDROData_LandCoverMap.cxx
-  ../HYDROData/HYDROData_QuadTree.cxx
-  ../HYDROData/HYDROData_QuadTreeNode.cxx
+  ../HYDROData/HYDROData_Quadtree.cxx
+  ../HYDROData/HYDROData_QuadtreeNode.cxx
   ../HYDROData/HYDROData_LCM_FaceClassifier.cxx
   ../HYDROData/HYDROData_DTM.cxx