tests revision

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index e1f52ed7c2190701facf6a4226208d923a1fa37a..e474ad9ab0f1136c600c77a8c3f180a1626ccfff 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -38,7 +38,7 @@
 #include <BRep_Builder.hxx>
 
 const QString REF_DATA_PATH = qgetenv( "HYDRO_REFERENCE_DATA" );
-const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt";
+const QString DEF_STR_PATH = qgetenv( "HYDRO_SRC_DIR" ) + "/src/HYDROGUI/resources/def_strickler_table.txt";
 
 void test_HYDROData_LandCoverMap::test_add_2_objects()
 {

diff --git a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
index a7c2da126e81bec5763c0da90480f39290d411fd..05b2dc4b1c2124508522407161606b75653daacd 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
+++ b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx
@@ -24,7 +24,7 @@
 #include <QColor>
 #include <QDir>
 
-const QString DEF_STR_PATH = qgetenv( "HYDRO_ROOT_DIR" ) + "/share/salome/resources/hydro/def_strickler_table.txt";
+const QString DEF_STR_PATH = qgetenv( "HYDRO_SRC_DIR" ) + "/src/HYDROGUI/resources/def_strickler_table.txt";
 
 void test_HYDROData_StricklerTable::test_import()
 {

diff --git a/src/shapelib/CMakeLists.txt b/src/shapelib/CMakeLists.txt
index 419c3c4c6b548bf4ac0b87efb7279667d21cd409..94f8952d6302ae013f681cf97e36f839f2f6ac71 100644 (file)
--- a/src/shapelib/CMakeLists.txt
+++ b/src/shapelib/CMakeLists.txt
@@ -19,7 +19,7 @@ add_definitions(
 include_directories(
 )
 
-add_library(shapelib SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+add_library(shapelib STATIC ${PROJECT_SOURCES} ${PROJECT_HEADERS})
 INSTALL(TARGETS shapelib EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 set(PROJECT_LIBRARIES shapelib)