From 686284ad08d1426bb52aa44bbb07ea62e6b17f2f Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Thu, 23 Apr 2020 14:04:57 +0200 Subject: [PATCH] Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b8ab5f..ef525d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,9 +20,6 @@ cmake_minimum_required(VERSION 2.6) -# Ensure a proper linker behavior: -CMAKE_POLICY(SET CMP0003 NEW) - project(ADAO) include(CMakeDependentOption) @@ -49,7 +46,7 @@ set(ADAO_TEST "share/test/adao") 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() -- 2.39.2