ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-08 02:37:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Fix export of gui prerequisites root dirs

Browse Source
This commit is contained in:
mpa 2013-10-23 10:49:53 +00:00
parent 0748143593
commit 7c8c832723
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SalomeGEOMConfig.cmake.in
View File

@ -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@") SET_AND_CHECK(VTK_ROOT_DIR_EXP "@PACKAGE_VTK_ROOT_DIR@")
# Optional level 1 prerequisites: # Optional level 1 prerequisites:
IF(SALOME_BUILD_GUI) IF(SALOME_GEOM_BUILD_GUI)
SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
LIST(APPEND GEOM_DEFINITIONS "@GUI_DEFINITIONS@") LIST(APPEND GEOM_DEFINITIONS "@GUI_DEFINITIONS@")
ENDIF() ENDIF()
@ -107,17 +107,17 @@ SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") 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: # Include GUI targets if they were not already loaded:
IF(NOT (TARGET Event)) IF(NOT (TARGET Event))
INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake") INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake")
ENDIF() ENDIF()
ELSE(SALOME_BUILD_GUI) ELSE(SALOME_GEOM_BUILD_GUI)
# Include KERNEL targets if they were not already loaded: # Include KERNEL targets if they were not already loaded:
IF(NOT (TARGET SALOMEBasics) AND NOT SALOME_MED_STANDALONE) IF(NOT (TARGET SALOMEBasics) AND NOT SALOME_MED_STANDALONE)
INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake")
ENDIF() ENDIF()
ENDIF(SALOME_BUILD_GUI) ENDIF(SALOME_GEOM_BUILD_GUI)
# Exposed GEOM targets: # Exposed GEOM targets:
SET(GEOM_GEOMArchimede GEOMArchimede) SET(GEOM_GEOMArchimede GEOMArchimede)