Warning hunting

[modules/med.git] / SalomeMEDConfig.cmake.in

diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in
index fbc10b488265563dcab56e51f0e8eeeb352f4d51..c0e2a02abd2c7d9360593fd6aee0bff07f8bee59 100644 (file)
--- a/SalomeMEDConfig.cmake.in
+++ b/SalomeMEDConfig.cmake.in
@@ -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
@@ -94,7 +94,7 @@ MATH(EXPR _range "${_list_len}-1")
 FOREACH(_p RANGE ${_range})  
   LIST(GET _PREREQ            ${_p} _pkg    )
   LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir)
-  IF(NOT _pkg_dir STREQUAL "")
+  IF(_pkg_dir)
      MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...")
      FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE 
           PATHS "${_pkg_dir}" 
@@ -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)