mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-12-26 09:20:35 +05:00
Install config files in the adm_local directory.
This commit is contained in:
parent
80d9594b02
commit
a36a39787b
@ -49,7 +49,6 @@ IF(SALOME_LIGHT_ONLY)
|
|||||||
MESSAGE(FATAL_ERROR "GEOM module can't be built in Light mode (whiout CORBA)")
|
MESSAGE(FATAL_ERROR "GEOM module can't be built in Light mode (whiout CORBA)")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
|
||||||
# Platform setup
|
# Platform setup
|
||||||
# ==============
|
# ==============
|
||||||
INCLUDE(SalomeSetupPlatform) # From KERNEL
|
INCLUDE(SalomeSetupPlatform) # From KERNEL
|
||||||
@ -123,7 +122,7 @@ ENDIF(SALOME_BUILD_GUI)
|
|||||||
## Prerequisites From GUI:
|
## Prerequisites From GUI:
|
||||||
##
|
##
|
||||||
IF(SALOME_BUILD_GUI)
|
IF(SALOME_BUILD_GUI)
|
||||||
|
|
||||||
# Qt4
|
# Qt4
|
||||||
FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
|
FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
|
||||||
|
|
||||||
@ -256,13 +255,13 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
|
|||||||
# Ensure the variables are always defined for the configure:
|
# Ensure the variables are always defined for the configure:
|
||||||
SET(CAS_ROOT_DIR "${CAS_ROOT_DIR}")
|
SET(CAS_ROOT_DIR "${CAS_ROOT_DIR}")
|
||||||
SET(OPENCV_ROOT_DIR "${OPENCV_ROOT_DIR}")
|
SET(OPENCV_ROOT_DIR "${OPENCV_ROOT_DIR}")
|
||||||
SET(GUI_ROOT_DIR "$GUI_ROOT_DIR}")
|
SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
|
||||||
|
|
||||||
SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
|
SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include")
|
||||||
CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake.in
|
CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake.in
|
||||||
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
|
${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
|
||||||
INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}"
|
INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
|
||||||
PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE CMAKE_INSTALL_PREFIX
|
PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
|
||||||
KERNEL_ROOT_DIR GUI_ROOT_DIR CAS_ROOT_DIR OPENCV_ROOT_DIR)
|
KERNEL_ROOT_DIR GUI_ROOT_DIR CAS_ROOT_DIR OPENCV_ROOT_DIR)
|
||||||
|
|
||||||
# - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?):
|
# - in the install tree (VSR 16/08/2013: TEMPORARILY COMMENT THIS - TO REMOVE?):
|
||||||
@ -284,8 +283,8 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVers
|
|||||||
INSTALL(FILES
|
INSTALL(FILES
|
||||||
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
||||||
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
|
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
|
||||||
DESTINATION "${SALOME_INSTALL_CMAKE}")
|
DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}")
|
||||||
|
|
||||||
# Install the export set for use with the install-tree
|
# Install the export set for use with the install-tree
|
||||||
INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE}"
|
INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}"
|
||||||
FILE ${PROJECT_NAME}Targets.cmake)
|
FILE ${PROJECT_NAME}Targets.cmake)
|
||||||
|
Loading…
Reference in New Issue
Block a user