X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=12df474b21c39e5ec9667dc8a48a36debd91ef10;hb=a23b198721de69ce7d7b3ad46aabf18516a9e137;hp=a9ba1b5b2f7189f70a0ec9be878364dcd21863ac;hpb=641dbf8d3327be267c9226904db9f754196559cf;p=modules%2Fyacs.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9ba1b5b2..12df474b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2023  CEA, EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,22 +19,27 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 INCLUDE(CMakeDependentOption)
 
+# Project name
+# ============
+# original
 PROJECT(SalomeYACS C CXX)
+# upper case
+STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-# Ensure a proper linker behavior:
-CMAKE_POLICY(SET CMP0003 NEW)
+# 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 NO_POLICY_SCOPE)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
 
 # 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 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})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SALOME_SETUP_VERSION(9.11.0)
+MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Find KERNEL (optional)
 # ==============
@@ -42,8 +47,6 @@ OPTION(SALOME_YACS_USE_KERNEL "Use SALOME KERNEL" ON)
 IF( SALOME_YACS_USE_KERNEL )
   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)
@@ -54,8 +57,6 @@ IF( SALOME_YACS_USE_KERNEL )
   SALOME_LOG_OPTIONAL_PACKAGE(SalomeKERNEL SALOME_YACS_USE_KERNEL)
 ELSE( SALOME_YACS_USE_KERNEL )
   MESSAGE(STATUS "Option SALOME_YACS_USE_KERNEL is set to OFF, so YACS will be built without CORBA!!!")
-  LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm/cmake")
-  INCLUDE(SalomeMacros)
 ENDIF( SALOME_YACS_USE_KERNEL )
 
 # Find SALOME GUI (optional)
@@ -65,7 +66,6 @@ CMAKE_DEPENDENT_OPTION(SALOME_BUILD_GUI "Build GUI of YACS" ON
 IF(SALOME_BUILD_GUI)
   SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
   IF(EXISTS ${GUI_ROOT_DIR})
-    LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
     FIND_PACKAGE(SalomeGUI)
     SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
     SALOME_GUI_MODE(SALOME_USE_QXGRAPHVIEWER) # check whether GUI is built with the QxGraphViewer
@@ -77,11 +77,9 @@ ENDIF(SALOME_BUILD_GUI)
 
 # Platform setup
 # ==============
-INCLUDE(SalomeSetupPlatform)   # From SalomeMacros
+INCLUDE(SalomeSetupPlatform)   # From CONFIGURATION
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
-# Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm/cmake")
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(-DCMAKE_BUILD)
@@ -96,8 +94,14 @@ OPTION(SALOME_BUILD_TESTS "Build SALOME YACS tests" ON)
 
 OPTION(SALOME_YACS_USE_SWIG       "Enable Python wrapper"    ON)
 OPTION(SALOME_YACS_USE_DSC        "Use DSC KERNEL extension" ON)
-CMAKE_DEPENDENT_OPTION(SALOME_YACS_USE_QSCINTILLA "Use QScintilla" ON
-                       "SALOME_BUILD_GUI" OFF)
+OPTION(SALOME_YACS_USE_EMBEDDED_PMML "Use YACS PMML implementation" ON)
+
+CMAKE_DEPENDENT_OPTION(SALOME_YACS_USE_PYEDITOR "Use built-in py editor" ON
+                       "SALOME_USE_PYVIEWER" OFF)
+
+IF(SALOME_YACS_USE_PYEDITOR)
+    ADD_DEFINITIONS(-DHAS_PYEDITOR)
+ENDIF(SALOME_YACS_USE_PYEDITOR)
 
 # Advanced options:
 IF(SALOME_YACS_USE_KERNEL AND SALOME_YACS_USE_DSC)
@@ -119,7 +123,9 @@ ENDIF()
 ##
 
 # Mandatory products
-FIND_PACKAGE(SalomePython    REQUIRED)
+FIND_PACKAGE(SalomePythonInterp REQUIRED)
+FIND_PACKAGE(SalomePythonLibs REQUIRED)
+FIND_PACKAGE(SalomeNumPySciPy)
 FIND_PACKAGE(SalomePThread   REQUIRED)
 ADD_DEFINITIONS(-DYACS_PTHREAD)
 FIND_PACKAGE(SalomeBoost     REQUIRED)
@@ -142,10 +148,6 @@ IF(SALOME_BUILD_TESTS)
 ENDIF()
 
 IF(SALOME_BUILD_DOC)
-  IF(SALOME_USE_MPI)
-    FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx
-    SALOME_LOG_OPTIONAL_PACKAGE(MPI SALOME_BUILD_DOC)
-  ENDIF()  
   FIND_PACKAGE(SalomeDoxygen)
   FIND_PACKAGE(SalomeSphinx)
   SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
@@ -157,20 +159,25 @@ ENDIF()
 IF(SALOME_BUILD_GUI)
   # Graphviz
   FIND_PACKAGE(SalomeGraphviz  REQUIRED)
-  # Qt4
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+  # Qt
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
 ENDIF(SALOME_BUILD_GUI)
 
-# QScintilla
-IF(SALOME_YACS_USE_QSCINTILLA)
-  FIND_PACKAGE(SalomeQScintilla)
-  SALOME_LOG_OPTIONAL_PACKAGE(QScintilla SALOME_YACS_USE_QSCINTILLA)
-  ADD_DEFINITIONS(-DHAS_QSCI4)
-ENDIF(SALOME_YACS_USE_QSCINTILLA)
-
 ##
 ## YACS specifics
 ##
+# External PMML
+# =============
+IF(NOT SALOME_YACS_USE_EMBEDDED_PMML)
+  SET(PMML_ROOT_DIR $ENV{PMML_ROOT_DIR} CACHE PATH "Path to PMML")
+  IF(EXISTS ${PMML_ROOT_DIR})
+    LIST(APPEND CMAKE_MODULE_PATH "${PMML_ROOT_DIR}/share")
+    INCLUDE(PMMLlibTargets)
+  ELSE()
+    MESSAGE(FATAL_ERROR "We absolutely need the PMML CMake configuration files, please define PMML_ROOT_DIR !")
+  ENDIF()
+ENDIF(NOT SALOME_YACS_USE_EMBEDDED_PMML)
+
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
@@ -236,12 +243,15 @@ SET(SALOME_YACS_INSTALL_SUPERV_SAMPLES share/salome/yacssupervsamples CACHE PATH
   "Install path: SALOME YACS SUPERV samples")
 SET(SALOME_INSTALL_HXX2SALOME bin/HXX2SALOME_Test CACHE PATH 
   "Install path: SALOME HXX2SALOME Test files")
+SET(SALOME_YACS_INSTALL_TEST ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test CACHE PATH 
+  "Install path: SALOME YACS Test files")
 MARK_AS_ADVANCED(
   SALOME_YACS_INSTALL_RES_DATA
   SALOME_YACS_INSTALL_RES_SCRIPTS
   SALOME_YACS_INSTALL_SAMPLES
   SALOME_YACS_INSTALL_SUPERV_SAMPLES
   SALOME_INSTALL_HXX2SALOME
+  SALOME_YACS_INSTALL_TEST
   )
 
 # Accumulate environment variables for YACS module
@@ -264,7 +274,6 @@ ADD_SUBDIRECTORY(Demo)
 
 # Header configuration
 # ====================
-SALOME_XVERSION(${PROJECT_NAME})
 SALOME_CONFIGURE_FILE(YACS_version.h.in YACS_version.h INSTALL ${SALOME_INSTALL_HEADERS})
 
 # Configuration export
@@ -275,12 +284,12 @@ 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 
-  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)
 
@@ -297,7 +306,7 @@ ENDIF(SALOME_BUILD_TESTS)
 
 IF(SALOME_BUILD_GUI)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-    HMI GenericGui YACS SalomeWrap
+    HMI ydfxwidgets GenericGui YACS SalomeWrap
   )
 ENDIF(SALOME_BUILD_GUI)
 
@@ -311,19 +320,18 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #      Ensure the variables are always defined for the configure:
 SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
 SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-SET(QT4_ROOT_DIR "${QT4_ROOT_DIR}")
-SET(QSCINTILLA_ROOT_DIR "${QSCINTILLA_ROOT_DIR}")
+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:
-SALOME_CONFIGURE_PREPARE(QScintilla Qt4)
+SALOME_CONFIGURE_PREPARE(Qt5)
 
 CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in 
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-    KERNEL_ROOT_DIR GUI_ROOT_DIR QT4_ROOT_DIR QSCINTILLA_ROOT_DIR)
+    KERNEL_ROOT_DIR GUI_ROOT_DIR QT_ROOT_DIR)
 
 #   - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?):
 #       Get the relative path of the include directory so 
@@ -333,7 +341,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
 #    ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake
 #    INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
 #    PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX 
-#    KERNEL_ROOT_DIR GUI_ROOT_DIR QT4_ROOT_DIR QSCINTILLA_ROOT_DIR)
+#    KERNEL_ROOT_DIR GUI_ROOT_DIR QT_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}