mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-11 16:19:17 +05:00
Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies
This commit is contained in:
parent
150483de56
commit
bb27da6b38
@ -38,7 +38,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()
|
||||
@ -47,7 +47,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
|
||||
ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
|
||||
@ -61,8 +60,6 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
|
||||
INCLUDE(SalomeSetupPlatform) # From KERNEL
|
||||
# Always build libraries as shared objects:
|
||||
SET(BUILD_SHARED_LIBS TRUE)
|
||||
# Local macros:
|
||||
LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
|
||||
|
||||
# User options
|
||||
# ============
|
||||
@ -115,7 +112,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_OCCVIEWER SALOME_USE_VTKVIEWER SALOME_USE_SALOMEOBJECT
|
||||
|
Loading…
Reference in New Issue
Block a user