X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=a24f5c22dde2c4efc827f12293895ad3ad23a1b8;hb=caf945fd0c26bc81b86717e955c4a79613220530;hp=89a463eceb62a51fe1851536c3f24bb2a584b8f9;hpb=301fcc69dc7b0f1f3f1f1e844a22cfa722253c8d;p=modules%2Fyacs.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89a463ece..a24f5c22d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# 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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,22 +17,37 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
+INCLUDE(CMakeDependentOption)
+
 PROJECT(SalomeYACS 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 2)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 1)
 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)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+
+# 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)
 # ==============
@@ -41,8 +56,8 @@ 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)
     INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
   ELSE( EXISTS ${KERNEL_ROOT_DIR} )
@@ -51,16 +66,21 @@ 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)
 # ==============
-OPTION(SALOME_BUILD_GUI "Build GUI of YACS" ON)
+CMAKE_DEPENDENT_OPTION(SALOME_BUILD_GUI "Build GUI of YACS" ON
+                       "SALOME_YACS_USE_KERNEL" OFF)
 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 REQUIRED)
+    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
   ELSE(EXISTS ${GUI_ROOT_DIR})
     MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR or turn option SALOME_BUILD_GUI to OFF !")
   ENDIF(EXISTS ${GUI_ROOT_DIR})
@@ -75,21 +95,26 @@ SET(BUILD_SHARED_LIBS TRUE)
 # Local macros:
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm/cmake")
 
-# User options
-# ============
-# (some options may have already been defined in KERNEL) 
+# additional preprocessor / compiler flags
 ADD_DEFINITIONS(-DCMAKE_BUILD)
-IF( SALOME_YACS_USE_KERNEL )
-  OPTION(SALOME_BUILD_DOC "Generate SALOME YACS documentation" ${SALOME_BUILD_DOC})
-  OPTION(SALOME_BUILD_TESTS "Build SALOME YACS tests" ${SALOME_BUILD_TESTS})
-ELSE( SALOME_YACS_USE_KERNEL )
-  OPTION(SALOME_BUILD_DOC "Generate SALOME YACS documentation" ON)
-  OPTION(SALOME_BUILD_TESTS "Build SALOME YACS tests" ON)
-ENDIF( SALOME_YACS_USE_KERNEL )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
+
+# User options
+# ============ 
+OPTION(SALOME_BUILD_DOC "Generate SALOME YACS documentation" ON)
+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_QSCINTILLA "Use QScintilla"           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)
@@ -111,35 +136,33 @@ 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)
 FIND_PACKAGE(SalomeOmniORB   REQUIRED)
 FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 ADD_DEFINITIONS(-DOMNIORB)
 FIND_PACKAGE(SalomeLibXml2   REQUIRED)
-FIND_PACKAGE(SalomeGraphviz  REQUIRED)
 
 # Optional products:
 IF(SALOME_YACS_USE_SWIG)
-  FIND_PACKAGE(SalomeSWIG REQUIRED)
+  FIND_PACKAGE(SalomeSWIG)
   SALOME_LOG_OPTIONAL_PACKAGE(SWIG SALOME_YACS_USE_SWIG)
 #  ADD_DEFINITIONS(-DSWIG)
 ENDIF()
 
 IF(SALOME_BUILD_TESTS)
   ENABLE_TESTING()
-  FIND_PACKAGE(SalomeCppUnit REQUIRED)
+  FIND_PACKAGE(SalomeCppUnit)
   SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)  
 ENDIF()
 
 IF(SALOME_BUILD_DOC)
-  IF(SALOME_USE_MPI)
-    FIND_PACKAGE(SalomeMPI REQUIRED) # needed for doc generation by Sphinx
-    SALOME_LOG_OPTIONAL_PACKAGE(MPI SALOME_BUILD_DOC)
-  ENDIF()  
-  FIND_PACKAGE(SalomeDoxygen REQUIRED)
-  FIND_PACKAGE(SalomeSphinx REQUIRED)
+  FIND_PACKAGE(SalomeDoxygen)
+  FIND_PACKAGE(SalomeSphinx)
   SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
   ADD_DEFINITIONS(-DDOXYGEN_IS_OK)
@@ -147,23 +170,20 @@ ENDIF()
 
 # Find optional GUI libraries
 IF(SALOME_BUILD_GUI)
-  # Qt4
-  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-  SALOME_LOG_OPTIONAL_PACKAGE(Qt4 SALOME_BUILD_GUI)
-  # QScintilla
-  IF(SALOME_YACS_USE_QSCINTILLA)
-    FIND_PACKAGE(SalomeQScintilla REQUIRED)
-    SALOME_LOG_OPTIONAL_PACKAGE(QScintilla SALOME_YACS_USE_QSCINTILLA)
-    ADD_DEFINITIONS(-DHAS_QSCI4)
-  ENDIF(SALOME_YACS_USE_QSCINTILLA)
+  # 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()
 ENDIF(SALOME_BUILD_GUI)
 
 ##
 ## YACS specifics
 ##
 
-FIND_PACKAGE(SalomeExpat REQUIRED)
-
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()
 
@@ -228,17 +248,25 @@ 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
+SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
+                                                 ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
+
 # Sources 
 # ========
-IF(SALOME_YACS_USE_KERNEL AND NOT SALOME_LIGHT_ONLY)
+IF(SALOME_YACS_USE_KERNEL)
   ADD_SUBDIRECTORY(idl)
 ENDIF()
 
@@ -248,7 +276,6 @@ IF(SALOME_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF()
 ADD_SUBDIRECTORY(Demo)
-ADD_SUBDIRECTORY(Misc)
 
 # Header configuration
 # ====================
@@ -263,13 +290,30 @@ 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 
-  YACSloader YACSBases YACSlibEngine YACSRuntimeSALOME YACSDLTest SalomeIDLYACS
-  #TODO: TestComponentLocal PluginSimplex PluginOptEvTest1
+  YACSBases YACSlibEngine 
 )
-IF(SALOME_BUILD_GUI)
+
+IF(SALOME_YACS_USE_KERNEL)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+    SalomeIDLYACS YACSRuntimeSALOME YACSloader YACSevalYFX
+  )
+ENDIF(SALOME_YACS_USE_KERNEL)
+
+IF(SALOME_BUILD_TESTS)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets 
-    HMI GenericGui YACS SalomeWrap
+    YACSDLTest PluginSimplex PluginOptEvTest1
+  )
+  IF(SALOME_YACS_USE_KERNEL)
+    LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+      TestComponentLocal yacsloader_echo
     )
+  ENDIF(SALOME_YACS_USE_KERNEL)
+ENDIF(SALOME_BUILD_TESTS)
+
+IF(SALOME_BUILD_GUI)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+    HMI ydfxwidgets GenericGui YACS SalomeWrap
+  )
 ENDIF(SALOME_BUILD_GUI)
 
 # Add all targets to the build-tree export set
@@ -280,16 +324,28 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #   - in the build tree:
 
 #      Ensure the variables are always defined for the configure:
+SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
 SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-SET(EXPAT_ROOT_DIR "${EXPAT_ROOT_DIR}")
-SET(QSCINTILLA_ROOT_DIR "${QSCINTILLA_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(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()
+
 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)
+    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 
@@ -299,8 +355,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 SIP_ROOT_DIR QT4_ROOT_DIR PYQT4_ROOT_DIR CAS_ROOT_DIR 
-#       OPENGL_ROOT_DIR VTK_ROOT_DIR QWT_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}