From: asl Date: Thu, 22 Oct 2015 09:28:46 +0000 (+0300) Subject: tests revision X-Git-Tag: v1.5~75^2~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4de6eab0446e075de57f40eb7465c740ec428c7d;p=modules%2Fhydro.git tests revision --- diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx index e1f52ed7..e474ad9a 100644 --- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx +++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx @@ -38,7 +38,7 @@ #include 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 a7c2da12..05b2dc4b 100644 --- a/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx +++ b/src/HYDRO_tests/test_HYDROData_StricklerTable.cxx @@ -24,7 +24,7 @@ #include #include -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 419c3c4c..94f8952d 100644 --- 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)