Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies
This commit is contained in:
parent
bac2122ad7
commit
1c3adb2066
@ -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 built with CORBA
|
||||
ELSE(EXISTS ${KERNEL_ROOT_DIR})
|
||||
@ -95,7 +93,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 built with CORBA
|
||||
SALOME_GUI_MODE(SALOME_USE_SALOMEOBJECT)
|
||||
@ -125,7 +122,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")
|
||||
@ -135,7 +131,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})
|
||||
|
Loading…
Reference in New Issue
Block a user