Merge branch 'V7_dev'

diff --combined CMakeLists.txt
index c65fe555e0549a70e832b313c40fc664eb114616,3c9487d819d43eb53952b6c59c2296f48abeece9..aac1a39a036bfad21ebb7393f832ec3bd5b7ccbb
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2014-2015  OPEN CASCADE
+ # Copyright (C) 2014-2016  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,9 -28,9 +28,9 @@@ CMAKE_POLICY(SET CMP0003 NEW
  # Project name, upper case
  STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
  
 -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
 -SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
 -SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
 +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
 +SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 +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})
  SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
@@@ -114,17 -114,14 +114,18 @@@ ENDIF(
  
  # Pre-requisites
  # ==============
- FIND_PACKAGE(SalomePython REQUIRED)
+ FIND_PACKAGE(SalomePythonInterp REQUIRED)
+ FIND_PACKAGE(SalomePythonLibs REQUIRED)
  FIND_PACKAGE(SalomeCAS REQUIRED)
  FIND_PACKAGE(SalomeDXF REQUIRED)
  FIND_PACKAGE(SalomeOmniORB REQUIRED)
  FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
  IF(SALOME_BUILD_GUI)
 -  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 +  IF(NOT SALOME_GUI_BUILD_WITH_QT5)
 +    FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
 +  ELSE()
 +    FIND_PACKAGE(SalomeQt5 REQUIRED)
 +  ENDIF()
  ENDIF(SALOME_BUILD_GUI)
  IF(SALOME_BUILD_DOC)
    FIND_PACKAGE(SalomeDoxygen)

diff --combined src/CMakeLists.txt
index bd8d1640890bc08442057e882f943eed9f62882a,9b7876416fe108ce8094c770d0ff26220cb2c67e..885003b4371aaba21728cc7e82654777a6780c9b
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,4 -1,4 +1,4 @@@
- # Copyright (C) 2014-2015  OPEN CASCADE
+ # Copyright (C) 2014-2016  OPEN CASCADE
  #
  # This library is free software; you can redistribute it and/or
  # modify it under the terms of the GNU Lesser General Public
@@@ -18,7 -18,8 +18,7 @@@
  #
  
  IF(SALOME_BUILD_GUI)
 -  INCLUDE(UseQt4Ext)
 -  INCLUDE(${QT_USE_FILE})
 +  INCLUDE(UseQtExt)
  ENDIF()
  
  # --- options ---
@@@ -101,7 -102,7 +101,7 @@@ ENDIF(
  
  IF(SALOME_BUILD_GUI)
    # sources / moc wrappings
 -  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
 +  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
  
    SET(DXFPluginGUI_SOURCES
      DXFPlugin_GUI.cxx
@@@ -145,7 -146,7 +145,7 @@@ IF(SALOME_BUILD_GUI
    TARGET_LINK_LIBRARIES(DXFPluginGUI ${_link_gui_LIBRARIES})
    INSTALL(TARGETS DXFPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
    # install resources
 -  QT4_INSTALL_TS_RESOURCES("${DXFPlugin_RESOURCES}" "${SALOME_DXFPLUGIN_INSTALL_RES_DATA}")
 +  QT_INSTALL_TS_RESOURCES("${DXFPlugin_RESOURCES}" "${SALOME_DXFPLUGIN_INSTALL_RES_DATA}")
  ENDIF()
  
  # install headers