Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first ver. (creating of new channel => calc case => export calc case works OK)
[modules/hydro.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index cbbb5a659ee5d11b756e6d97a8f812e4c11f6c7d..ceb5f5a6c1b705f73327711440cf89895597844d 100644
(file)
--- 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)
PROJECT(SalomeHYDRO C CXX)
+ADD_SUBDIRECTORY (src/HYDRO_tests)
+
+INCLUDE(CMakeDependentOption)
+
# Ensure a proper linker behavior:
CMAKE_POLICY(SET CMP0003 NEW)
# Ensure a proper linker behavior:
CMAKE_POLICY(SET CMP0003 NEW)
@@
-92,8
+95,9
@@
OPTION(SALOME_BUILD_TESTS "Build HYDRO tests" ON)
# Mandatory products:
# 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)
FIND_PACKAGE(SalomeCAS REQUIRED)
FIND_PACKAGE(SalomeVTK REQUIRED)
FIND_PACKAGE(SalomeOmniORB REQUIRED)
@@
-185,10
+189,10
@@
MARK_AS_ADVANCED(
# Sources
# ========
ADD_SUBDIRECTORY (src/shapelib)
# 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/HYDROData)
ADD_SUBDIRECTORY (src/HYDROGUI)
ADD_SUBDIRECTORY (src/HYDROPy)
+ADD_SUBDIRECTORY (src/HYDROTools)
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc)
ENDIF()
IF(SALOME_BUILD_DOC)
ADD_SUBDIRECTORY(doc)
ENDIF()