From 3bad706506371caeff1e1a54d5a180936c608b34 Mon Sep 17 00:00:00 2001 From: mpa Date: Tue, 24 Dec 2013 13:35:27 +0000 Subject: [PATCH] CMake: - Edit a list of dependent modules to set ROOT_DIR - Add targets for current module --- SalomePARAVISConfig.cmake.in | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/SalomePARAVISConfig.cmake.in b/SalomePARAVISConfig.cmake.in index 05195b05..e7c93046 100644 --- a/SalomePARAVISConfig.cmake.in +++ b/SalomePARAVISConfig.cmake.in @@ -44,7 +44,7 @@ SET_AND_CHECK(PARAVIS_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") # Include directories SET_AND_CHECK(PARAVIS_INCLUDE_DIRS "${PARAVIS_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") SET(PARAVIS_INCLUDE_DIRS "${PARAVIS_INCLUDE_DIRS};@_SalomePARAVIS_EXTRA_HEADERS@") -SET(PARAVIS_DEFINITIONS "@KERNEL_DEFINITIONS@") +SET(PARAVIS_DEFINITIONS "@GUI_DEFINITIONS@") # Package specific environment variables @_SalomePARAVIS_EXTRA_ENV_FULL@ @@ -64,9 +64,12 @@ SET(SALOME_USE_PLOT2DVIEWER @SALOME_USE_PLOT2DVIEWER@) # Level 1 prerequisites: SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") -SET_AND_CHECK(SIP_ROOT_DIR_EXP "@PACKAGE_SIP_ROOT_DIR@") -SET_AND_CHECK(QT4_ROOT_DIR_EXP "@PACKAGE_QT4_ROOT_DIR@") -SET_AND_CHECK(PYQT4_ROOT_DIR_EXP "@PACKAGE_PYQT4_ROOT_DIR@") +SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") +IF(SALOME_PARAVIS_BUILD_PLUGINS) + SET_AND_CHECK(MED_ROOT_DIR_EXP "@PACKAGE_MED_ROOT_DIR@") + LIST(APPEND PARAVIS_DEFINITIONS "@MED_DEFINITIONS@") +ENDIF() +SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@") # Optional level 1 prerequisites: @@ -118,9 +121,18 @@ SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") -# Include KERNEL targets if they were not already loaded: -IF(NOT (TARGET SALOMEBasics)) - INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") +# Include GUI targets if they were not already loaded: +IF(NOT (TARGET Event)) + INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake") +ENDIF() +IF(SALOME_PARAVIS_BUILD_PLUGINS) + # Include MED targets if they were not already loaded: + IF(NOT (TARGET SalomeIDLMED)) + INCLUDE("${MED_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeMEDTargets.cmake") + ENDIF() ENDIF() # Exposed PARAVIS targets: +SET(PARAVIS_SalomeIDLPARAVIS SalomeIDLPARAVIS) +SET(PARAVIS_PARAVIS PARAVIS) +SET(PARAVIS_PARAVISEngine PARAVISEngine) -- 2.39.2