X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=CMakeLists.txt;h=2e5189bf1c2674d02c2578dbdbbfcf43b3d696be;hp=ad0d4f1396d37e442840e3af6b974353b20009c7;hb=066f625a46b60642f228a0c10fc6c2dcdc20d304;hpb=b0a908c0d20341651771d0249fb10882f54b2aad diff --git a/CMakeLists.txt b/CMakeLists.txt index ad0d4f139..2e5189bf1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2015 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 @@ -28,8 +28,8 @@ 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}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 5) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) 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) @@ -41,14 +41,11 @@ 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}) -IF(SALOME_LIGHT_ONLY) - MESSAGE(FATAL_ERROR "SMESH module can't be built in Light mode (without CORBA)") -ENDIF() - # Platform setup # ============== INCLUDE(SalomeSetupPlatform) # From KERNEL @@ -104,9 +101,6 @@ FIND_PACKAGE(SalomeLibXml2 REQUIRED) FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C) # Other KERNEL optionals: -IF(SALOME_USE_MPI) - FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx -ENDIF() IF(SALOME_BUILD_TESTS) ENABLE_TESTING() FIND_PACKAGE(SalomeCppUnit) @@ -125,7 +119,7 @@ IF(SALOME_BUILD_GUI) IF(EXISTS ${GUI_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI) - + FULL_GUI(TRUE) #check whether GUI builded in full mode and with CORBA ## ## Prerequisites From GUI: ## @@ -165,7 +159,7 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR}) ## # VTK is obligatiry for the SMESH -FIND_PACKAGE(SalomeVTK 6.0 REQUIRED) +FIND_PACKAGE(SalomeVTK REQUIRED) FIND_PACKAGE(SalomeCAS REQUIRED)