From 0a912922fa2ec91d8f041b8c5280714d74157457 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 20 Apr 2020 11:51:09 +0300 Subject: [PATCH] Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies --- CMakeLists.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e53f6f6..0232f9f 100644 --- 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}) @@ -101,7 +99,6 @@ ENDIF() 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 ADD_DEFINITIONS(${GUI_DEFINITIONS}) @@ -131,7 +128,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") @@ -142,7 +138,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) ADD_DEFINITIONS(${SMESH_DEFINITIONS}) INCLUDE_DIRECTORIES(${SMESH_INCLUDE_DIRS}) @@ -172,10 +167,8 @@ ENDIF(SALOME_USE_MG_LIBS) IF(SALOME_HEXOTICPLUGIN_USE_BLSURFPLUGIN) SET(BLSURFPLUGIN_ROOT_DIR $ENV{BLSURFPLUGIN_ROOT_DIR} CACHE PATH "Path to the Salome BLSURFPLUGIN") IF(EXISTS ${BLSURFPLUGIN_ROOT_DIR}) - LIST(APPEND CMAKE_MODULE_PATH "${BLSURFPLUGIN_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeBLSURFPLUGIN) SALOME_LOG_OPTIONAL_PACKAGE(SalomeBLSURFPLUGIN WITH_BLSURFPLUGIN) - ENDIF(EXISTS ${BLSURFPLUGIN_ROOT_DIR}) IF(SalomeBLSURFPLUGIN_FOUND) ADD_DEFINITIONS(-DWITH_BLSURFPLUGIN) -- 2.39.2