-# Copyright (C) 2012-2016 CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019 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
# Project name, upper case
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
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 (optional)
# ==============
OPTION(SALOME_YACS_USE_KERNEL "Use SALOME KERNEL" ON)
SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
IF( EXISTS ${KERNEL_ROOT_DIR} )
LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
- INCLUDE(SalomeMacros)
FIND_PACKAGE(SalomeKERNEL REQUIRED)
KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA
ADD_DEFINITIONS(${KERNEL_DEFINITIONS} -DSALOME_KERNEL)
# Graphviz
FIND_PACKAGE(SalomeGraphviz REQUIRED)
# Qt
- IF(NOT SALOME_GUI_BUILD_WITH_QT5)
- FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
- ELSE()
- FIND_PACKAGE(SalomeQt5 REQUIRED)
- ENDIF()
+ FIND_PACKAGE(SalomeQt5 REQUIRED)
ENDIF(SALOME_BUILD_GUI)
##
# 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
- YACSBases YACSlibEngine
+ YACSBases YACSlibEngine YACSlibWorkloadmanager
)
IF(SALOME_YACS_USE_KERNEL)
LIST(APPEND _${PROJECT_NAME}_exposed_targets
- SalomeIDLYACS YACSRuntimeSALOME YACSloader
+ SalomeIDLYACS YACSRuntimeSALOME YACSloader YACSevalYFX
)
ENDIF(SALOME_YACS_USE_KERNEL)
IF(SALOME_BUILD_GUI)
LIST(APPEND _${PROJECT_NAME}_exposed_targets
- HMI GenericGui YACS SalomeWrap
+ HMI ydfxwidgets GenericGui YACS SalomeWrap
)
ENDIF(SALOME_BUILD_GUI)
# Ensure the variables are always defined for the configure:
SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-IF(NOT SALOME_GUI_BUILD_WITH_QT5)
- SET(QT_ROOT_DIR "${QT4_ROOT_DIR}")
-ELSE()
- SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
-ENDIF()
+SET(QT_ROOT_DIR "${QT5_ROOT_DIR}")
SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
# Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-IF(NOT SALOME_GUI_BUILD_WITH_QT5)
- SALOME_CONFIGURE_PREPARE(Qt4)
-ELSE()
- SALOME_CONFIGURE_PREPARE(Qt5)
-ENDIF()
+SALOME_CONFIGURE_PREPARE(Qt5)
CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake