X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=9c8dbcd844e79d5d869fdeb5ed16e6ad69aa57d1;hb=1c7c17682ebfb369350c229ae36d68d83073fa4b;hp=176582e01350b1386aff0cd0baa69c2da2b10573;hpb=9d91b0eac6b735bc098e0d4fa50b8833534bd38c;p=modules%2Fhydro.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 176582e0..9c8dbcd8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,8 @@ CMAKE_POLICY(SET CMP0003 NEW) # Project name, upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 1) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 5) +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 2) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 0) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) @@ -188,20 +188,24 @@ SET(SALOME_HYDRO_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/hydro" CACHE PATH "Install path: SALOME HYDRO scripts") SET(SALOME_HYDRO_INSTALL_SAMPLES share/salome/hydrosamples CACHE PATH "Install path: SALOME HYDRO samples") +SET(SALOME_HYDRO_INSTALL_PLUGINS share/salome/plugins/hydro CACHE PATH + "Install path: SALOME HYDRO plugins") + MARK_AS_ADVANCED( SALOME_HYDRO_INSTALL_RES_DATA SALOME_HYDRO_INSTALL_RES_SCRIPTS SALOME_HYDRO_INSTALL_SAMPLES + SALOME_HYDRO_INSTALL_PLUGINS ) # Sources # ======== ADD_SUBDIRECTORY (src/shapelib) +ADD_SUBDIRECTORY (src/HYDRO_tests) ADD_SUBDIRECTORY (src/HYDROData) ADD_SUBDIRECTORY (src/HYDROGUI) ADD_SUBDIRECTORY (src/HYDROPy) ADD_SUBDIRECTORY (src/HYDROTools) -ADD_SUBDIRECTORY (src/HYDRO_tests) IF(SALOME_BUILD_DOC) ADD_SUBDIRECTORY(doc) ENDIF()