X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=776898143f622c6a9bc6ab362adf22241b5e89b7;hb=a7aaf82f21f0b0e547b3e80cec4785c38a881bac;hp=bb2e6cc4039dcb2de36dd84f494c401cbce11ac6;hpb=8af4ec523b30b4037c04b6f202dbc18c292888e0;p=samples%2Fatomsolv.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb2e6cc..7768981 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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
@@ -28,7 +28,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 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 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})
@@ -41,6 +41,7 @@ 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 
 ELSE(EXISTS ${KERNEL_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
 ENDIF(EXISTS ${KERNEL_ROOT_DIR})
@@ -53,11 +54,22 @@ SET(BUILD_SHARED_LIBS TRUE)
 # Local macros:
 LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
-# User options
-# (some options have already been defined in KERNEL) 
+# User options 
 # ============
-#OPTION(SALOME_BUILD_DOC "Generate SALOME ATOMSOLV documentation" ${SALOME_BUILD_DOC}) For use in the future
-#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future
+#OPTION(SALOME_BUILD_DOC "Generate SALOME ATOMSOLV documentation" ON) #for use in the future
+OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON)
+
+IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
+ENDIF()
+
+##
+## From KERNEL:
+##
+FIND_PACKAGE(SalomePython REQUIRED)
+FIND_PACKAGE(SalomeOmniORB REQUIRED)
+FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
+FIND_PACKAGE(SalomePThread REQUIRED)
 
 # Find GUI
 # ===========
@@ -66,24 +78,18 @@ 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)
+  FULL_GUI(TRUE) # check whether GUI builded in full mode and with CORBA
 ELSE(EXISTS ${GUI_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
 ENDIF(EXISTS ${GUI_ROOT_DIR})
 
 ##
-## ATOMSOLV specifics
+## From GUI:
 ##
-
-FIND_PACKAGE(SalomePython REQUIRED)
-FIND_PACKAGE(SalomeOmniORB REQUIRED)
-FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
-# Qt4
+FIND_PACKAGE(SalomeCAS REQUIRED)
+FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 INCLUDE(${QT_USE_FILE})
-#OCCT
-FIND_PACKAGE(SalomeCAS)
-# VTK
-FIND_PACKAGE(SalomeVTK 6.0)
 
 # Find ATOMGEN
 # ===========
@@ -91,6 +97,8 @@ SET(ATOMGEN_ROOT_DIR $ENV{ATOMGEN_ROOT_DIR} CACHE PATH "Path to the Salome ATOMG
 IF(EXISTS ${ATOMGEN_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${ATOMGEN_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeATOMGEN REQUIRED)
+  ADD_DEFINITIONS(${ATOMGEN_DEFINITIONS})
+  INCLUDE_DIRECTORIES(${ATOMGEN_INCLUDE_DIRS})
 ELSE(EXISTS ${ATOMGEN_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome ATOMGEN, please define ATOMGEN_ROOT_DIR")
 ENDIF(EXISTS ${ATOMGEN_ROOT_DIR})
@@ -133,6 +141,11 @@ MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
 MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
 MARK_AS_ADVANCED(SALOME_ATOMSOLV_INSTALL_RES_DATA)
 
+# Accumulate environment variables for ATOMSOLV 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 
 # ========
 ADD_SUBDIRECTORY(idl)
@@ -165,15 +178,18 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #   - in the build tree:
 
 # Ensure the variables are always defined for the configure:
-SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
 SET(ATOMGEN_ROOT_DIR "${ATOMGEN_ROOT_DIR}")
 
 SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
-CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake.in 
+
+# Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
+# SALOME_CONFIGURE_PREPARE() #For use in the future
+
+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
-       GUI_ROOT_DIR ATOMGEN_ROOT_DIR)
+    ATOMGEN_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}