From: rnv <rnv@opencascade.com>
Date: Wed, 10 Aug 2016 13:53:05 +0000 (+0300)
Subject: Merge branch 'abn/configuration'
X-Git-Tag: V8_1_0b1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=8408df59c58cdda76191f1edc7ee3811c9ab54c8;hp=-c

Merge branch 'abn/configuration'
---

8408df59c58cdda76191f1edc7ee3811c9ab54c8
diff --combined CMakeLists.txt
index ebd1da1e4,490c0e008..ece28f210
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -21,9 -21,6 +21,9 @@@ PROJECT(SalomeSMESH C CXX
  
  # Ensure a proper linker behavior:
  CMAKE_POLICY(SET CMP0003 NEW)
 +IF(WIN32)
 +  CMAKE_POLICY(SET CMP0020 OLD) # disable automatic linking to qtmain.lib 
 +ENDIF(WIN32)
  
  # Versioning
  # ===========
@@@ -37,12 -34,21 +37,21 @@@ SET(${PROJECT_NAME_UC}_VERSIO
    ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
  SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
+ # Common CMake macros
+ # ===================
+ SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
+ IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+   LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+   INCLUDE(SalomeMacros)
+ ELSE()
+   MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ ENDIF()
+ 
  # Find KERNEL
  # ===========
  SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
  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
    ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
@@@ -300,7 -306,7 +309,7 @@@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO
  
  IF(SALOME_BUILD_GUI)
    LIST(APPEND _${PROJECT_NAME}_exposed_targets
 -      SMESHObject SMESHFiltersSelection SMESH GeomSelectionTools StdMeshersGUI
 +      SMESHObject SMESHFiltersSelection SMESH PluginUtils StdMeshersGUI
    )
  ENDIF(SALOME_BUILD_GUI)