From: mpa Date: Wed, 23 Oct 2013 10:49:53 +0000 (+0000) Subject: CMake: Fix export of gui prerequisites root dirs X-Git-Tag: BR_hydro_v_0_3_1~68 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7c8c832723eeedb8a1b97bdcd916c4cdb4fdedf7;p=modules%2Fgeom.git CMake: Fix export of gui prerequisites root dirs --- diff --git a/SalomeGEOMConfig.cmake.in b/SalomeGEOMConfig.cmake.in index b15d96362..744464d95 100644 --- a/SalomeGEOMConfig.cmake.in +++ b/SalomeGEOMConfig.cmake.in @@ -62,7 +62,7 @@ SET_AND_CHECK(CAS_ROOT_DIR_EXP "@PACKAGE_CAS_ROOT_DIR@") SET_AND_CHECK(VTK_ROOT_DIR_EXP "@PACKAGE_VTK_ROOT_DIR@") # Optional level 1 prerequisites: -IF(SALOME_BUILD_GUI) +IF(SALOME_GEOM_BUILD_GUI) SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") LIST(APPEND GEOM_DEFINITIONS "@GUI_DEFINITIONS@") ENDIF() @@ -107,17 +107,17 @@ SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") -IF(SALOME_BUILD_GUI) +IF(SALOME_GEOM_BUILD_GUI) # 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() -ELSE(SALOME_BUILD_GUI) +ELSE(SALOME_GEOM_BUILD_GUI) # Include KERNEL targets if they were not already loaded: IF(NOT (TARGET SALOMEBasics) AND NOT SALOME_MED_STANDALONE) INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") ENDIF() -ENDIF(SALOME_BUILD_GUI) +ENDIF(SALOME_GEOM_BUILD_GUI) # Exposed GEOM targets: SET(GEOM_GEOMArchimede GEOMArchimede)