bos #37326: fix compilation issue on Windows - replacing usleep with sleep_for &...

[modules/yacs.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26b5a8a5f724c56b3e7cbac60f15550beb5a1e6a..12df474b21c39e5ec9667dc8a48a36debd91ef10 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2020  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,20 +19,13 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
 INCLUDE(CMakeDependentOption)
 
+# Project name
+# ============
+# original
 PROJECT(SalomeYACS C CXX)
-
-# Versioning
-# ===========
-# Project name, upper case
+# upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
-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 1)
-
 # Common CMake macros
 # ===================
 SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
@@ -43,6 +36,11 @@ ELSE()
   MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
 ENDIF()
 
+# Versioning
+# ===========
+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)
 # ==============
 OPTION(SALOME_YACS_USE_KERNEL "Use SALOME KERNEL" ON)
@@ -96,6 +94,7 @@ 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)
+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)
@@ -167,6 +166,18 @@ ENDIF(SALOME_BUILD_GUI)
 ##
 ## 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()
@@ -263,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