Salome HOME
projects
/
plugins
/
ghs3dprlplugin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4751075
)
Include SalomeMacros.cmake with NO_POLICY_SCOPE to apply policies
V9_5_0b1
author
vsr
<vsr@opencascade.com>
Mon, 20 Apr 2020 07:58:23 +0000
(10:58 +0300)
committer
vsr
<vsr@opencascade.com>
Mon, 20 Apr 2020 07:58:23 +0000
(10:58 +0300)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index e752d67b3582a9570c0467fff25fa47fb926e943..9c7dbb75ffa94b435387e42d475b11b82534185b 100644
(file)
--- 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")
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()
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})
# ===========
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
INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
FIND_PACKAGE(SalomeKERNEL REQUIRED)
KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA
INCLUDE_DIRECTORIES(${KERNEL_INCLUDE_DIRS})
@@
-102,7
+100,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})
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})
FIND_PACKAGE(SalomeGUI)
SALOME_GUI_WITH_CORBA() # check whether GUI builded with CORBA
ADD_DEFINITIONS(${GUI_DEFINITIONS})
@@
-131,7
+128,6
@@
FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM")
IF(EXISTS ${GEOM_ROOT_DIR})
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")
FIND_PACKAGE(SalomeGEOM REQUIRED)
ELSE(EXISTS ${GEOM_ROOT_DIR})
MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR")
@@
-141,7
+137,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})
# ===========
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})
FIND_PACKAGE(SalomeSMESH REQUIRED)
ADD_DEFINITIONS(${SMESH_DEFINITIONS})
INCLUDE_DIRECTORIES(${SMESH_INCLUDE_DIRS})