From 77f34b97f134975c6f0c8776b9732865aed71c67 Mon Sep 17 00:00:00 2001 From: ana Date: Thu, 14 Nov 2013 14:28:00 +0000 Subject: [PATCH] Small fix for SALOME_CONFIGURE_PREPARE() macros --- salome_adm/cmake_files/SalomeMacros.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/salome_adm/cmake_files/SalomeMacros.cmake b/salome_adm/cmake_files/SalomeMacros.cmake index df81302fb..609f21db3 100755 --- a/salome_adm/cmake_files/SalomeMacros.cmake +++ b/salome_adm/cmake_files/SalomeMacros.cmake @@ -846,7 +846,13 @@ ENDMACRO(SALOME_GENERATE_TESTS_ENVIRONMENT) MACRO(SALOME_APPEND_LIST_OF_LIST result element_list) SET(_tmp_res) STRING(REPLACE ";" "," _tmp_res "${${element_list}}") - SET(${result} "${${result}};${_tmp_res}") # LIST(APPEND ...) doesn't handle well empty elements!? + + LIST(LENGTH result _list_len) + 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 + ENDIF() ENDMACRO(SALOME_APPEND_LIST_OF_LIST) ######################################################################### @@ -873,7 +879,9 @@ 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) -- 2.39.2