mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-12 01:30:34 +05:00
Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies
This commit is contained in:
parent
94ef875259
commit
9f9759f50d
@ -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")
|
SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
|
||||||
IF(EXISTS ${CONFIGURATION_ROOT_DIR})
|
IF(EXISTS ${CONFIGURATION_ROOT_DIR})
|
||||||
LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
|
LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
|
||||||
INCLUDE(SalomeMacros)
|
INCLUDE(SalomeMacros NO_POLICY_SCOPE)
|
||||||
ELSE()
|
ELSE()
|
||||||
MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
|
MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
@ -47,7 +47,6 @@ ENDIF()
|
|||||||
# ===========
|
# ===========
|
||||||
SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
|
SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
|
||||||
IF(EXISTS ${KERNEL_ROOT_DIR})
|
IF(EXISTS ${KERNEL_ROOT_DIR})
|
||||||
LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
|
|
||||||
FIND_PACKAGE(SalomeKERNEL REQUIRED)
|
FIND_PACKAGE(SalomeKERNEL REQUIRED)
|
||||||
KERNEL_WITH_CORBA() #check whether KERNEL built with CORBA
|
KERNEL_WITH_CORBA() #check whether KERNEL built with CORBA
|
||||||
ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
|
ADD_DEFINITIONS(${KERNEL_DEFINITIONS})
|
||||||
@ -61,8 +60,6 @@ ENDIF(EXISTS ${KERNEL_ROOT_DIR})
|
|||||||
INCLUDE(SalomeSetupPlatform) # From KERNEL
|
INCLUDE(SalomeSetupPlatform) # From KERNEL
|
||||||
# Always build libraries as shared objects:
|
# Always build libraries as shared objects:
|
||||||
SET(BUILD_SHARED_LIBS TRUE)
|
SET(BUILD_SHARED_LIBS TRUE)
|
||||||
# Local macros:
|
|
||||||
LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
|
|
||||||
|
|
||||||
# User options
|
# User options
|
||||||
# ============
|
# ============
|
||||||
@ -143,7 +140,6 @@ ENDIF()
|
|||||||
IF(SALOME_BUILD_GUI)
|
IF(SALOME_BUILD_GUI)
|
||||||
SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
|
SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
|
||||||
IF(EXISTS ${GUI_ROOT_DIR})
|
IF(EXISTS ${GUI_ROOT_DIR})
|
||||||
LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
|
|
||||||
FIND_PACKAGE(SalomeGUI)
|
FIND_PACKAGE(SalomeGUI)
|
||||||
SALOME_GUI_WITH_CORBA() #check whether GUI built with CORBA
|
SALOME_GUI_WITH_CORBA() #check whether GUI built with CORBA
|
||||||
SALOME_GUI_MODE(SALOME_USE_VTKVIEWER SALOME_USE_SALOMEOBJECT
|
SALOME_GUI_MODE(SALOME_USE_VTKVIEWER SALOME_USE_SALOMEOBJECT
|
||||||
@ -169,7 +165,6 @@ ENDIF(SALOME_BUILD_GUI)
|
|||||||
# ===========
|
# ===========
|
||||||
SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
|
SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
|
||||||
IF(EXISTS ${GEOM_ROOT_DIR})
|
IF(EXISTS ${GEOM_ROOT_DIR})
|
||||||
LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files")
|
|
||||||
FIND_PACKAGE(SalomeGEOM REQUIRED)
|
FIND_PACKAGE(SalomeGEOM REQUIRED)
|
||||||
ADD_DEFINITIONS(${GEOM_DEFINITIONS})
|
ADD_DEFINITIONS(${GEOM_DEFINITIONS})
|
||||||
INCLUDE_DIRECTORIES(${GEOM_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${GEOM_INCLUDE_DIRS})
|
||||||
@ -187,7 +182,6 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR})
|
|||||||
SET(WITH_SHAPER_STUDY OFF)
|
SET(WITH_SHAPER_STUDY OFF)
|
||||||
SET(SHAPERSTUDY_ROOT_DIR $ENV{SHAPERSTUDY_ROOT_DIR} CACHE PATH "Path to the Salome SHAPERSTUDY")
|
SET(SHAPERSTUDY_ROOT_DIR $ENV{SHAPERSTUDY_ROOT_DIR} CACHE PATH "Path to the Salome SHAPERSTUDY")
|
||||||
IF(EXISTS ${SHAPERSTUDY_ROOT_DIR})
|
IF(EXISTS ${SHAPERSTUDY_ROOT_DIR})
|
||||||
LIST(APPEND CMAKE_MODULE_PATH "${SHAPERSTUDY_ROOT_DIR}/adm_local/cmake_files")
|
|
||||||
FIND_PACKAGE(SalomeSHAPERSTUDY)
|
FIND_PACKAGE(SalomeSHAPERSTUDY)
|
||||||
IF(SalomeSHAPERSTUDY_FOUND)
|
IF(SalomeSHAPERSTUDY_FOUND)
|
||||||
SET(WITH_SHAPER_STUDY ON)
|
SET(WITH_SHAPER_STUDY ON)
|
||||||
|
Loading…
Reference in New Issue
Block a user