diff --git a/cmake/readPSBConst.cmake b/cmake/readPSBConst.cmake index 207c60da..47a28f69 100644 --- a/cmake/readPSBConst.cmake +++ b/cmake/readPSBConst.cmake @@ -16,15 +16,19 @@ string(REGEX MATCH "psb_dupl_add_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_add_match "${_ set(PSBLASDUPADD "${CMAKE_MATCH_1}") string(REGEX MATCH "psb_dupl_err_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_err_match "${_psb_const_mod}") set(PSBLASDUPERR "${CMAKE_MATCH_1}") -string(REGEX MATCH "psb_dupl_def_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_def_match "${_psb_const_mod}") +string(REGEX MATCH "psb_dupl_ovwrt_[ \t]+=[ \t]+([0-9]+)" _psb_dupl_ovw_match "${_psb_const_mod}") +set(PSBLASDUPOVW "${CMAKE_MATCH_1}") +string(REGEX MATCH "psb_dupl_def_[ \t]+=[ \t]+([^ \t]+)_" _psb_dupl_def_match "${_psb_const_mod}") set(PSBLASDUPDEF "${CMAKE_MATCH_1}") +string(TOUPPER ${PSBLASDUPDEF} PSBLASDUPDEF) string(REGEX MATCH "psb_upd_srch_[ \t]+=[ \t]+([0-9]+)" _psb_upd_srch_match "${_psb_const_mod}") set(PSBLASUPDSRC "${CMAKE_MATCH_1}") string(REGEX MATCH "psb_upd_perm_[ \t]+=[ \t]+([0-9]+)" _psb_upd_perm_match "${_psb_const_mod}") set(PSBLASUPDPRM "${CMAKE_MATCH_1}") -string(REGEX MATCH "psb_upd_dflt_[ \t]+=[ \t]+([0-9]+)" _psb_upd_dflt_match "${_psb_const_mod}") +string(REGEX MATCH "psb_upd_dflt_[ \t]+=[ \t]+([^ \t]+)_" _psb_upd_dflt_match "${_psb_const_mod}") set(PSBLASUPDDEF "${CMAKE_MATCH_1}") +string(TOUPPER ${PSBLASUPDDEF} PSBLASUPDDEF) string(REGEX MATCH "psb_matbld_noremote_[ \t]+=[ \t]+([0-9]+)" _psb_matbld_noremote_match "${_psb_const_mod}") set(PSBLASBLDNOR "${CMAKE_MATCH_1}")