From: ana Date: Thu, 14 Nov 2013 15:20:35 +0000 (+0000) Subject: Fix for SALOME_CONFIGURE_PREPARE() macros: correction of the previous integration X-Git-Tag: BR_hydro_v_0_3_1~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=557748b9512b4fd62c9b9f676361a26f8883d9a9;p=modules%2Fkernel.git Fix for SALOME_CONFIGURE_PREPARE() macros: correction of the previous integration --- diff --git a/salome_adm/cmake_files/SalomeMacros.cmake b/salome_adm/cmake_files/SalomeMacros.cmake index 609f21db3..5dc41fcb6 100755 --- a/salome_adm/cmake_files/SalomeMacros.cmake +++ b/salome_adm/cmake_files/SalomeMacros.cmake @@ -851,7 +851,7 @@ MACRO(SALOME_APPEND_LIST_OF_LIST result element_list) IF(NOT _list_len EQUAL 0) SET(${result} "${${result}};${_tmp_res}") # LIST(APPEND ...) doesn't handle well empty elements!? ELSE() - SET(${result} "${_tmp_res}") # to avoid first excess ; at the beginning of the list + SET(${result} "${_tmp_res}") # to avoid first redundant ; at the beginning of the list ENDIF() ENDMACRO(SALOME_APPEND_LIST_OF_LIST) @@ -879,9 +879,7 @@ MACRO(SALOME_CONFIGURE_PREPARE) IF(${_prereq}_DIR) SET(_PREREQ_LIST "${_PREREQ_LIST} ${_prereq}") SET(_PREREQ_DIR_LIST "${_PREREQ_DIR_LIST} \"${${_prereq}_DIR}\"") - MESSAGE(STATUS "before _PREREQ_COMPO_LIST=${_PREREQ_COMPO_LIST}") SALOME_APPEND_LIST_OF_LIST(_PREREQ_COMPO_LIST Salome${_prereq}_COMPONENTS) - MESSAGE(STATUS "after _PREREQ_COMPO_LIST=${_PREREQ_COMPO_LIST}") ENDIF() ENDFOREACH() ENDMACRO(SALOME_CONFIGURE_PREPARE)