X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FAppQuickStart%2Fapp-template%2FCMakeLists.txt;h=d5b04106419893bde8810ea26df6969a96a68606;hb=4d61f5b8863253a259cde301c39b60909a6b18fa;hp=83df415cff2807f49243ccfe07b2e6a1d3785ee4;hpb=e83c49c22e04a5719890de53f54160295864f900;p=modules%2Fkernel.git diff --git a/src/AppQuickStart/app-template/CMakeLists.txt b/src/AppQuickStart/app-template/CMakeLists.txt index 83df415cf..d5b041064 100644 --- a/src/AppQuickStart/app-template/CMakeLists.txt +++ b/src/AppQuickStart/app-template/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2020 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2021 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 @@ -19,9 +19,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) PROJECT(Salome_[Name_of_Application]_Profile C CXX) -# Ensure a proper linker behavior: -CMAKE_POLICY(SET CMP0003 NEW) - # Versioning # =========== # Project name, upper case @@ -38,7 +35,7 @@ SET(${PROJECT_NAME_UC}_VERSION 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() @@ -47,7 +44,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") FIND_PACKAGE(SalomeKERNEL REQUIRED) KERNEL_WITH_CORBA() # check whether KERNEL built with CORBA ELSE(EXISTS ${KERNEL_ROOT_DIR})