Merge branch V7_3_1_BR

diff --combined CMakeLists.txt
index d9fc86219b533c8aa273a84d03224fd5c8b6e00b,c7df8a548a3616cec311f6987df5b660628e669f..558f090d68ee7768c30e8ba0648cca38db1f6319
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,9 -1,9 +1,9 @@@
 -# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
 +# Copyright (C) 2012-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
@@@ -29,10 -29,10 +29,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  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}_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 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Find KERNEL
  # ===========
@@@ -41,11 -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 "PYCALCULATOR module can't be built in Light mode (without CORBA)")
 -ENDIF()
 -
  # Platform setup
  # ==============
  INCLUDE(SalomeSetupPlatform)   # From KERNEL
@@@ -81,10 -84,6 +81,10 @@@ SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CAC
  IF(EXISTS ${MED_ROOT_DIR})
    LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
    FIND_PACKAGE(SalomeMED REQUIRED)
 +  IF(SALOME_MED_STANDALONE)
 +    MESSAGE(FATAL_ERROR "We absolutely need a Salome MED with KERNEL, 
 +                         please set SALOME_MED_STANDALONE=OFF when building MED module.")
 +  ENDIF()
  ELSE(EXISTS ${MED_ROOT_DIR})
    MESSAGE(FATAL_ERROR "We absolutely need a Salome MED, please define MED_ROOT_DIR")
  ENDIF(EXISTS ${MED_ROOT_DIR})