X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=3c46f782b2c78e7266c42b889f4838d9ec21b39f;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=115fcd23879f7b51f97f61836c948aa33cb8c554;hpb=7e825ec456c9331ef0df1cb59865cc55f0d8516a;p=modules%2Fhydro.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 115fcd23..3c46f782 100644
--- 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)
 
@@ -123,10 +125,13 @@ ENDIF(SALOME_BUILD_GUI)
 
 FIND_PACKAGE(SalomeCAS REQUIRED)
 
+FIND_PACKAGE(SalomeVTK REQUIRED)
+
 FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt4
 
 FIND_PACKAGE(SalomePyQt4 REQUIRED)
 
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
@@ -169,12 +174,12 @@ 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)
-  #ADD_SUBDIRECTORY(doc)
+  ADD_SUBDIRECTORY(doc)
 ENDIF()
 
 # Header configuration
@@ -190,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)
@@ -199,7 +204,7 @@ ENDIF(SALOME_BUILD_TESTS)
 
 IF(SALOME_BUILD_GUI)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-    HYDROGUI HYDROCurveCreator
+    HYDROGUI 
   )
 ENDIF(SALOME_BUILD_GUI)
 
@@ -248,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})
+