Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71da952c434b7b0dea5f7ce9cebec88316b0fc6f..10572fa1ab73b80036a38d9ac435621202f76c34 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 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)
+  INCLUDE(SalomeMacros NO_POLICY_SCOPE)
 ELSE()
   MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
 ENDIF()
@@ -45,8 +45,6 @@ ENDIF()
 # ===========
 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
 ELSE(EXISTS ${KERNEL_ROOT_DIR})
@@ -91,7 +89,6 @@ FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 IF(SALOME_BUILD_GUI)
   SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
   IF(EXISTS ${GUI_ROOT_DIR})
-    LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
     FIND_PACKAGE(SalomeGUI)
     SALOME_GUI_WITH_CORBA() #check whether GUI builded with CORBA
     # Qt 
@@ -112,7 +109,6 @@ FIND_PACKAGE(SalomeVTK REQUIRED)
 
 SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
 IF(EXISTS ${GEOM_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeGEOM REQUIRED)
 ELSE(EXISTS ${GEOM_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR")
@@ -123,7 +119,6 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR})
 
 SET(SMESH_ROOT_DIR $ENV{SMESH_ROOT_DIR} CACHE PATH "Path to the Salome SMESH")
 IF(EXISTS ${SMESH_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeSMESH REQUIRED)
   IF(SALOME_BUILD_GUI)
     IF(NOT SALOME_SMESH_BUILD_GUI)
@@ -141,7 +136,6 @@ ENDIF(EXISTS ${SMESH_ROOT_DIR})
 
 SET(HEXABLOCK_ROOT_DIR $ENV{HEXABLOCK_ROOT_DIR} CACHE PATH "Path to the Salome HEXABLOCK")
 IF(EXISTS ${HEXABLOCK_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${HEXABLOCK_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeHEXABLOCK REQUIRED)
   ADD_DEFINITIONS(${HEXABLOCK_DEFINITIONS})
   INCLUDE_DIRECTORIES(${HEXABLOCK_INCLUDE_DIRS})