correction of HYDRO for YAMM

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea8542758f6d0aeb03c3447b419c7d125d50ff66..db56a7c449c33adf07218032b194d18cf8b8dc40 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm/cmake")
 # User options
 # ============
 # (some options may have already been defined in KERNEL)
-OPTION(SALOME_BUILD_DOC "Generate HYDRO documentation" ON)
+OPTION(SALOME_BUILD_DOC "Generate HYDRO documentation" OFF)
 OPTION(SALOME_BUILD_TESTS "Build HYDRO tests" ON)
 
 # Prerequisites

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index 1d507ef4f7296bd8b998ce657fe2952ef07bb96a..d82add816944c54cbb8886d81869aaaa9cfc7970 100644 (file)
--- a/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@ -134,7 +134,7 @@ link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
 IF( ${WIN32} )
   SET( ECW_LIBRARIES libecwj2 )
 ELSE()
-  SET( ECW_LIBRARIES libecwj2 )
+  SET( ECW_LIBRARIES ecwj2 )
 ENDIF()
 
 add_definitions(

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 0dde980c6f03ed950df1a2bf763834a6e8307adb..0617a98dba75b4ae5b20b6fbd454f8bee67c0bf8 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -76,7 +76,7 @@ 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{QTDIR}/include $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 )
@@ -89,17 +89,14 @@ 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{QT_ROOT_DIR}/lib $ENV{QTDIR}/lib )
 IF( ${WIN32} )
-  IF( CMAKE_BUILD_TYPE MATCHES Debug )
-    SET( QT_LIBRARIES Qt5Cored Qt5Guid Qt5Testd )
-  ELSE()
-    SET( QT_LIBRARIES Qt5Core Qt5Gui Qt5Test )
-  ENDIF()
+  SET( QT_LIBRARIES Qt5Cored Qt5Guid Qt5Testd )
 ELSE()
-  SET( QT_LIBRARIES QtCore QtGui QtTest )
+  SET( QT_LIBRARIES Qt5Core Qt5Gui Qt5Test )
 ENDIF()
 
+
 link_directories( $ENV{CPPUNIT_ROOT_DIR}/lib )
 IF( ${WIN32} )
   IF( CMAKE_BUILD_TYPE MATCHES Debug )
@@ -119,7 +116,7 @@ link_directories( $ENV{ECWLIB_ROOT_DIR}/lib )
 IF( ${WIN32} )
   SET( ECW_LIBRARIES libecwj2 )
 ELSE()
-  SET( ECW_LIBRARIES libecwj2 )
+  SET( ECW_LIBRARIES ecwj2 )
 ENDIF()
 
 include_directories(