X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=e2159fed769c291c1ccc69a55c8b57e18fc5d04d;hb=0b3782b8e4aca78c4d3e0208166284822af420b8;hp=265f3048a30f4e296fd70628c3533cc219b031a4;hpb=23dcadbb9d8d9b90ede79391f2efa3da2203925d;p=modules%2Fyacs.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 265f3048a..e2159fed7 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-2014  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
@@ -30,7 +30,7 @@ CMAKE_POLICY(SET CMP0003 NEW)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+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})
@@ -45,6 +45,7 @@ IF( SALOME_YACS_USE_KERNEL )
     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} )
@@ -53,16 +54,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)
+    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})
@@ -77,9 +83,14 @@ 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)
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
+
 # User options
 # ============ 
-ADD_DEFINITIONS(-DCMAKE_BUILD)
 OPTION(SALOME_BUILD_DOC "Generate SALOME YACS documentation" ON)
 OPTION(SALOME_BUILD_TESTS "Build SALOME YACS tests" ON)
 
@@ -116,7 +127,6 @@ 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)
@@ -145,6 +155,8 @@ ENDIF()
 
 # Find optional GUI libraries
 IF(SALOME_BUILD_GUI)
+  # Graphviz
+  FIND_PACKAGE(SalomeGraphviz  REQUIRED)
   # Qt4
   FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 ENDIF(SALOME_BUILD_GUI)
@@ -241,7 +253,7 @@ SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${
 
 # Sources 
 # ========
-IF(SALOME_YACS_USE_KERNEL AND NOT SALOME_LIGHT_ONLY)
+IF(SALOME_YACS_USE_KERNEL)
   ADD_SUBDIRECTORY(idl)
 ENDIF()
 
@@ -265,16 +277,24 @@ 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
+  YACSBases YACSlibEngine 
 )
 
 IF(SALOME_YACS_USE_KERNEL)
-  LIST(APPEND _${PROJECT_NAME}_exposed_targets SalomeIDLYACS)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+    SalomeIDLYACS YACSRuntimeSALOME YACSloader
+  )
 ENDIF(SALOME_YACS_USE_KERNEL)
 
 IF(SALOME_BUILD_TESTS)
-  LIST(APPEND _${PROJECT_NAME}_exposed_targets YACSDLTest PluginSimplex
-       PluginOptEvTest1 TestComponentLocal)
+  LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+    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)