X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=15ea411ea51b8c2b5628ef1139a74c281f2bf2f8;hb=9c4b695101f6dfd8b305c42f37449b25688bf5e1;hp=ce776724f23aac80b71dcae4b9f0092df4dc32c9;hpb=06c45d9f7153be3a0ebbc7a9c3e45d57ddf39a0d;p=modules%2Fhomard.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce776724..15ea411e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,19 +22,32 @@ 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
 # ===========
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 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})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
+# Common CMake macros
+# ===================
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
+
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
@@ -66,8 +79,6 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 INCLUDE(SalomeSetupPlatform)   # From KERNEL
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
-# Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
 # additional preprocessor / compiler flags
 #ADD_DEFINITIONS(-DCMAKE_BUILD)
@@ -80,8 +91,11 @@ ENDIF(WIN32)
 OPTION(SALOME_BUILD_DOC "Generate SALOME HOMARD documentation" ON)
 OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
 
+# Python
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
 
-# Other KERNEL optionals: 
+# Other KERNEL optionals:
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)
@@ -93,12 +107,26 @@ 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:
 ##
 
-# Python
-FIND_PACKAGE(SalomePython REQUIRED)
 # Boost
 FIND_PACKAGE(SalomeBoost REQUIRED)
 # CORBA
@@ -113,12 +141,20 @@ FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C)
 ##
 
 # Various
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+# Qt
+IF (NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 # SIP
 FIND_PACKAGE(SalomeSIP REQUIRED)
-# PyQt4
-FIND_PACKAGE(SalomePyQt4 REQUIRED)
+# PyQt
+IF (NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomePyQt4 REQUIRED)
+ELSE()
+  FIND_PACKAGE(SalomePyQt5 REQUIRED)
+ENDIF()
 # OCCT
 FIND_PACKAGE(SalomeCAS REQUIRED)
 
@@ -129,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})
@@ -153,6 +191,23 @@ ENDIF(EXISTS ${SMESH_ROOT_DIR})
 # MedFile
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 
+# OpenCASCADE
+FIND_PACKAGE(SalomeCAS 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()