refs #760: correct grammatic mistake in warning.

[modules/hydro.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f2d9d317f7ea289b742e49bf9d0a2ac9d54bbce..8951fca1b04c61f3affba63b1c402419e5d1d8b9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ INCLUDE(CMakeDependentOption)
 
 PROJECT(SalomeHYDRO C CXX)
 
+ADD_SUBDIRECTORY (src/HYDRO_tests)
+
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
 
@@ -11,8 +13,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 0)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 1)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 1)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
 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})
@@ -172,13 +174,13 @@ MARK_AS_ADVANCED(
 
 # Sources 
 # ========
-ADD_SUBDIRECTORY (src/HYDROCurveCreator)
+ADD_SUBDIRECTORY (src/shapelib)
 ADD_SUBDIRECTORY (src/HYDROData)
 ADD_SUBDIRECTORY (src/HYDROGUI)
 ADD_SUBDIRECTORY (src/HYDROPy)
-#IF(SALOME_BUILD_DOC)
+IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
-#ENDIF()
+ENDIF()
 
 # Header configuration
 # ====================
@@ -193,7 +195,7 @@ INCLUDE(CMakePackageConfigHelpers)
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
 SET(_${PROJECT_NAME}_exposed_targets 
-  HYDROData HYDROPy
+  shapelib HYDROData HYDROPy
 )
 
 IF(SALOME_BUILD_TESTS)
@@ -202,7 +204,7 @@ ENDIF(SALOME_BUILD_TESTS)
 
 IF(SALOME_BUILD_GUI)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-    HYDROGUI HYDROCurveCreator
+    HYDROGUI 
   )
 ENDIF(SALOME_BUILD_GUI)
 
@@ -251,3 +253,9 @@ INSTALL(FILES
 # Install the export set for use with the install-tree
 INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" 
         FILE ${PROJECT_NAME}Targets.cmake)
+
+
+
+SET(_bin_scripts bin/hydro_setenv.py)
+SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})
+