]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
CMake: Fix export of gui prerequisites root dirs
authormpa <mpa@opencascade.com>
Wed, 23 Oct 2013 10:51:32 +0000 (10:51 +0000)
committermpa <mpa@opencascade.com>
Wed, 23 Oct 2013 10:51:32 +0000 (10:51 +0000)
SalomeMEDConfig.cmake.in

index fbc10b488265563dcab56e51f0e8eeeb352f4d51..21836be9f50da6244574d91849aac219cf83dc23 100644 (file)
@@ -71,10 +71,10 @@ IF(NOT SALOME_MED_STANDALONE)
   SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@")
   LIST(APPEND MED_DEFINITIONS "@KERNEL_DEFINITIONS@")
 ENDIF(NOT SALOME_MED_STANDALONE)
-IF(SALOME_BUILD_GUI)
+IF(SALOME_MED_BUILD_GUI)
   SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@")
   LIST(APPEND MED_DEFINITIONS "@GUI_DEFINITIONS@")
-ENDIF(SALOME_BUILD_GUI)
+ENDIF(SALOME_MED_BUILD_GUI)
 
 # For all prerequisites, load the corresponding targets if the package was used 
 # in CONFIG mode. This ensures dependent projects link correctly
@@ -118,19 +118,19 @@ SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@")
 SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@")
 SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
 
-IF(SALOME_BUILD_GUI) 
+IF(SALOME_MED_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_MED_BUILD_GUI)
   IF(NOT SALOME_MED_STANDALONE) 
     # 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(NOT SALOME_MED_STANDALONE) 
-ENDIF(SALOME_BUILD_GUI)
+ENDIF(SALOME_MED_BUILD_GUI)
 
 # Exposed MED targets:
 SET(MED_interpkernel interpkernel)