X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=ceb5f5a6c1b705f73327711440cf89895597844d;hb=c3a1182d0afc0fcb0bb15f814b0b5819671209cd;hp=cbbb5a659ee5d11b756e6d97a8f812e4c11f6c7d;hpb=a932582e3a8d634a8ef989b7c8e9e9b85db6ad78;p=modules%2Fhydro.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbbb5a65..ceb5f5a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,11 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-INCLUDE(CMakeDependentOption)
 
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 PROJECT(SalomeHYDRO C CXX)
 
+ADD_SUBDIRECTORY (src/HYDRO_tests)
+
+INCLUDE(CMakeDependentOption)
+
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
 
@@ -92,8 +95,9 @@ OPTION(SALOME_BUILD_TESTS "Build HYDRO tests" ON)
 
 # Mandatory products:
 
-FIND_PACKAGE(SalomePythonInterp REQUIRED)
-FIND_PACKAGE(SalomePythonLibs REQUIRED)
+FIND_PACKAGE(SalomePython REQUIRED)
+#FIND_PACKAGE(SalomePythonInterp REQUIRED)
+#FIND_PACKAGE(SalomePythonLibs REQUIRED)
 FIND_PACKAGE(SalomeCAS     REQUIRED)
 FIND_PACKAGE(SalomeVTK     REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
@@ -185,10 +189,10 @@ MARK_AS_ADVANCED(
 # 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)
 IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF()