Increment version: 8.5.0

[modules/homard.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0b7e84d8137e83d220b8d85718f7dae03f498f2..b0bf6cdd2ebde995b28bb257e650a73dc2e49c0d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,9 @@ PROJECT(SalomeHOMARD C CXX)
 
 # Ensure a proper linker behavior:
 CMAKE_POLICY(SET CMP0003 NEW)
+IF(WIN32)
+  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib
+ENDIF(WIN32)
 
 # Versioning
 # ===========
@@ -29,7 +32,7 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+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})
@@ -92,7 +95,7 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 FIND_PACKAGE(SalomePythonInterp REQUIRED)
 FIND_PACKAGE(SalomePythonLibs REQUIRED)
 
-# Other KERNEL optionals: 
+# Other KERNEL optionals:
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)
@@ -104,6 +107,22 @@ IF(SALOME_BUILD_DOC)
 ENDIF()
 
 
+# Advanced options:
+OPTION(FRONTTRACK_USE_TBB "Enable parallel computation using TBB" OFF)
+MARK_AS_ADVANCED(FRONTTRACK_USE_TBB)
+
+# Prerequisites
+# =============
+
+# MEDCoupling
+SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to the MEDCoupling tool")
+IF(EXISTS ${MEDCOUPLING_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")
+  FIND_PACKAGE(SalomeMEDCoupling REQUIRED)   # will reload HDF5, MEDFile, XDR, etc ...
+ELSE(EXISTS ${MEDCOUPLING_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need the MEDCoupling tool, please define MEDCOUPLING_ROOT_DIR !")
+ENDIF(EXISTS ${MEDCOUPLING_ROOT_DIR})
+
 ##
 ## From KERNEL:
 ##
@@ -137,7 +156,7 @@ ELSE()
   FIND_PACKAGE(SalomePyQt5 REQUIRED)
 ENDIF()
 # OCCT
-FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 
 # Find GEOM
 # ===========
@@ -146,6 +165,8 @@ SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
 IF(EXISTS ${GEOM_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeGEOM REQUIRED)
+  ADD_DEFINITIONS(${GEOM_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${GEOM_INCLUDE_DIRS})
 ELSE(EXISTS ${GEOM_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR")
 ENDIF(EXISTS ${GEOM_ROOT_DIR})
@@ -170,6 +191,20 @@ ENDIF(EXISTS ${SMESH_ROOT_DIR})
 # MedFile
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
+# TBB
+IF(FRONTTRACK_USE_TBB)
+  FIND_PACKAGE(SalomeTBB)
+  SALOME_LOG_OPTIONAL_PACKAGE(TBB FRONTTRACK_USE_TBB)
+  ADD_DEFINITIONS(-DHAVE_TBB)
+ENDIF(FRONTTRACK_USE_TBB)
+
+# Python
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+# SWIG
+FIND_PACKAGE(SalomeSWIG REQUIRED)
+# Boost
+FIND_PACKAGE(SalomeBoost REQUIRED)
+
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
 
@@ -249,7 +284,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
-  HOMARDImpl HOMARDEngine HOMARD SalomeIDLHOMARD
+  HOMARDImpl HOMARDEngine HOMARD SalomeIDLHOMARD FrontTrack
 )
 
 # Add all targets to the build-tree export set