Merge branch V7_3_1_BR

diff --combined CMakeLists.txt
index 5ec86d7e8450c65ba075b290d4485a71ae979af0,01e1edf5c8a8f58d8a75ef0b35c289d2e1a1b0c6..7bc39a301d9457bae020ea1c04d1b0da25f8644e
--- 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 "NETGENPLUGIN module can't be built in Light mode (without CORBA)")
 -ENDIF()
 -
  # Platform setup
  # ==============
  INCLUDE(SalomeSetupPlatform)   # From KERNEL
@@@ -91,7 -94,6 +91,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
    ELSE(EXISTS ${GUI_ROOT_DIR})
      MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
    ENDIF(EXISTS ${GUI_ROOT_DIR})
@@@ -110,7 -112,7 +110,7 @@@ ENDIF(SALOME_BUILD_GUI
  # OCCT
  FIND_PACKAGE(SalomeCAS REQUIRED)
  # VTK
- FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
+ FIND_PACKAGE(SalomeVTK 6.1 REQUIRED)
  
  
  # Find GEOM