From 6a3a47bfc4f8ace1858e79af94bed39ef7a3ef51 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Sun, 29 Sep 2024 14:50:46 -0700 Subject: [PATCH] fix ADD_GROUP_PROPERTY_TO_MAP --- cmake/macros/GenerateEntityProperties.cmake | 80 ++++++++++----------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/cmake/macros/GenerateEntityProperties.cmake b/cmake/macros/GenerateEntityProperties.cmake index 11bc3ff0cb..ef37b24149 100644 --- a/cmake/macros/GenerateEntityProperties.cmake +++ b/cmake/macros/GenerateEntityProperties.cmake @@ -108,11 +108,11 @@ macro(GENERATE_ENTITY_PROPERTIES) endif() endif() elseif(LINE MATCHES "group:.*,") - string(REGEX MATCH ".*group:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_GROUP ${LINE}) + string(REGEX MATCH ".*group:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_GROUP ${LINE}) set(ENTITY_PROPERTY_GROUP ${CMAKE_MATCH_1}) CAPITALIZE_FIRST_LETTER(${ENTITY_PROPERTY_GROUP}) set(ENTITY_PROPERTY_GROUP_CAPS ${CAPITALIZE_RESULT}) - string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_GROUP_TYPE ${LINE}) + string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_GROUP_TYPE ${LINE}) if (CMAKE_MATCH_1) set(ENTITY_PROPERTY_GROUP_TYPE "${CMAKE_MATCH_1}PropertyGroup") else() @@ -164,50 +164,50 @@ macro(GENERATE_ENTITY_PROPERTIES) string(CONCAT ${CURRENT_TYPE}_ENTITY_DEBUG "${${CURRENT_TYPE}_ENTITY_DEBUG}" "\t_${ENTITY_PROPERTY_GROUP}Properties.debugDump();\n") endif() else() - string(REGEX MATCH ".*enum:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_ENUM ${LINE}) + string(REGEX MATCH ".*enum:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_ENUM ${LINE}) string(CONCAT ENTITY_PROPERTY_ENUM "PROP_" ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*prop:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_NAME ${LINE}) + string(REGEX MATCH ".*prop:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_NAME ${LINE}) set(ENTITY_PROPERTY_NAME ${CMAKE_MATCH_1}) CAPITALIZE_FIRST_LETTER(${ENTITY_PROPERTY_NAME}) set(ENTITY_PROPERTY_NAME_CAPS ${CAPITALIZE_RESULT}) - string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_TYPE ${LINE}) + string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_TYPE ${LINE}) set(ENTITY_PROPERTY_TYPE ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*default:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_DEFAULT ${LINE}) + string(REGEX MATCH ".*default:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_DEFAULT ${LINE}) set(ENTITY_PROPERTY_DEFAULT ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*min:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_MIN ${LINE}) + string(REGEX MATCH ".*min:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_MIN ${LINE}) set(ENTITY_PROPERTY_MIN ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*max:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_MAX ${LINE}) + string(REGEX MATCH ".*max:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_MAX ${LINE}) set(ENTITY_PROPERTY_MAX ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*fromScriptType:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_FROM_SCRIPT_TYPE ${LINE}) + string(REGEX MATCH ".*fromScriptType:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_FROM_SCRIPT_TYPE ${LINE}) set(ENTITY_PROPERTY_FROM_SCRIPT_TYPE ${CMAKE_MATCH_1}) if (NOT ENTITY_PROPERTY_FROM_SCRIPT_TYPE) set(ENTITY_PROPERTY_FROM_SCRIPT_TYPE ${ENTITY_PROPERTY_TYPE}) endif() - string(REGEX MATCH ".*getter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_GETTER ${LINE}) + string(REGEX MATCH ".*getter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_GETTER ${LINE}) set(ENTITY_PROPERTY_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*setter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_SETTER ${LINE}) + string(REGEX MATCH ".*setter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_SETTER ${LINE}) set(ENTITY_PROPERTY_SETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*networkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_NETWORK_GETTER ${LINE}) + string(REGEX MATCH ".*networkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_NETWORK_GETTER ${LINE}) set(ENTITY_PROPERTY_NETWORK_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableNetworkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_VARIABLE_NETWORK_GETTER ${LINE}) + string(REGEX MATCH ".*variableNetworkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_VARIABLE_NETWORK_GETTER ${LINE}) set(ENTITY_VARIABLE_NETWORK_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableNetworkSetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_VARIABLE_NETWORK_SETTER ${LINE}) + string(REGEX MATCH ".*variableNetworkSetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_VARIABLE_NETWORK_SETTER ${LINE}) set(ENTITY_VARIABLE_NETWORK_SETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableCopyGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_VARIABLE_COPY_GETTER ${LINE}) + string(REGEX MATCH ".*variableCopyGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_VARIABLE_COPY_GETTER ${LINE}) set(ENTITY_VARIABLE_COPY_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableCopySetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_VARIABLE_COPY_SETTER ${LINE}) + string(REGEX MATCH ".*variableCopySetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_VARIABLE_COPY_SETTER ${LINE}) set(ENTITY_VARIABLE_COPY_SETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*readType:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_READ_TYPE ${LINE}) + string(REGEX MATCH ".*readType:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_READ_TYPE ${LINE}) set(ENTITY_PROPERTY_READ_TYPE ${CMAKE_MATCH_1}) if (NOT ENTITY_PROPERTY_READ_TYPE) set(ENTITY_PROPERTY_READ_TYPE ${ENTITY_PROPERTY_TYPE}) endif() - string(REGEX MATCH ".*debugString:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_DEBUG_STRING ${LINE}) + string(REGEX MATCH ".*debugString:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_DEBUG_STRING ${LINE}) set(ENTITY_PROPERTY_DEBUG_STRING ${CMAKE_MATCH_1}) if (NOT ENTITY_PROPERTY_DEBUG_STRING) set(ENTITY_PROPERTY_DEBUG_STRING "\"\"") endif() - string(REGEX MATCH ".*debugGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_DEBUG_GETTER ${LINE}) + string(REGEX MATCH ".*debugGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_DEBUG_GETTER ${LINE}) set(ENTITY_PROPERTY_DEBUG_GETTER ${CMAKE_MATCH_1}) if(NOT LINE MATCHES ".*legacy( |,).*") @@ -239,7 +239,7 @@ macro(GENERATE_ENTITY_PROPERTIES) endif() endif() string(CONCAT ENTITY_ITEM_PROPERTY_MERGE "${ENTITY_ITEM_PROPERTY_MERGE}" "\tCOPY_PROPERTY_IF_CHANGED(${ENTITY_PROPERTY_NAME});\n") - if(ENTITY_PROPERTY_MIN AND ENTITY_PROPERTY_MAX) + if(DEFINED ENTITY_PROPERTY_MIN AND DEFINED ENTITY_PROPERTY_MAX) string(CONCAT ENTITY_ITEM_PROPERTY_ADD_TO_MAP "${ENTITY_ITEM_PROPERTY_ADD_TO_MAP}" "\t\tADD_PROPERTY_TO_MAP_WITH_RANGE(${ENTITY_PROPERTY_ENUM}, ${ENTITY_PROPERTY_NAME}, ${ENTITY_PROPERTY_MIN}, ${ENTITY_PROPERTY_MAX});\n") else() string(CONCAT ENTITY_ITEM_PROPERTY_ADD_TO_MAP "${ENTITY_ITEM_PROPERTY_ADD_TO_MAP}" "\t\tADD_PROPERTY_TO_MAP(${ENTITY_PROPERTY_ENUM}, ${ENTITY_PROPERTY_NAME}, ${ENTITY_PROPERTY_TYPE});\n") @@ -342,9 +342,9 @@ macro(GENERATE_ENTITY_PROPERTIES) endif() else() if(NOT LINE MATCHES ".*noScript( |,).*") - string(REGEX MATCH ".*proxy:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_PROXY ${LINE}) + string(REGEX MATCH ".*proxy:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_PROXY ${LINE}) set(ENTITY_PROPERTY_PROXY ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*proxyType:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" ENTITY_PROPERTY_PROXY_MAP_TYPE ${LINE}) + string(REGEX MATCH ".*proxyType:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" ENTITY_PROPERTY_PROXY_MAP_TYPE ${LINE}) set(ENTITY_PROPERTY_PROXY_MAP_TYPE ${CMAKE_MATCH_1}) if (NOT ENTITY_PROPERTY_PROXY_MAP_TYPE) set(ENTITY_PROPERTY_PROXY_MAP_TYPE ${ENTITY_PROPERTY_TYPE}) @@ -367,7 +367,7 @@ macro(GENERATE_ENTITY_PROPERTIES) string(CONCAT ENTITY_ITEM_PROPERTY_COPY_FROM_SCRIPT "${ENTITY_ITEM_PROPERTY_COPY_FROM_SCRIPT}" "\t}\n") endif() endif() - if(ENTITY_PROPERTY_MIN AND ENTITY_PROPERTY_MAX) + if(DEFINED ENTITY_PROPERTY_MIN AND DEFINED ENTITY_PROPERTY_MAX) string(CONCAT ENTITY_ITEM_PROPERTY_ADD_TO_MAP "${ENTITY_ITEM_PROPERTY_ADD_TO_MAP}" "\t\tADD_PROPERTY_TO_MAP_WITH_RANGE(${ENTITY_PROPERTY_ENUM}, ${ENTITY_PROPERTY_NAME}, ${ENTITY_PROPERTY_PROXY_MAP_TYPE}, ${ENTITY_PROPERTY_MIN}, ${ENTITY_PROPERTY_MAX}); // legacy support\n") else() string(CONCAT ENTITY_ITEM_PROPERTY_ADD_TO_MAP "${ENTITY_ITEM_PROPERTY_ADD_TO_MAP}" "\t\tADD_PROPERTY_TO_MAP(${ENTITY_PROPERTY_ENUM}, ${ENTITY_PROPERTY_NAME}, ${ENTITY_PROPERTY_PROXY_MAP_TYPE}); // legacy support\n") @@ -408,11 +408,11 @@ macro(GENERATE_ENTITY_PROPERTIES) while(GROUP_PROPERTIES_FILE) list(POP_FRONT GROUP_PROPERTIES_FILE LINE) if(NOT LINE MATCHES ".*,") - string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+).*" GROUP_PROPERTY_TYPE ${LINE}) + string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+).*" GROUP_PROPERTY_TYPE ${LINE}) set(GROUP_PROPERTY_TYPE ${CMAKE_MATCH_1}) if (GROUP_PROPERTY_TYPE) - string(REGEX MATCH "([A-Z0-9a-z_<>::\/\.\"\(\)\+]+) type:.*" CURRENT_TYPE ${LINE}) + string(REGEX MATCH "([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+) type:.*" CURRENT_TYPE ${LINE}) set(CURRENT_TYPE ${CMAKE_MATCH_1}) CAPITALIZE_FIRST_LETTER(${CURRENT_TYPE}) set(CURRENT_TYPE_CAPS ${CAPITALIZE_RESULT}) @@ -426,36 +426,36 @@ macro(GENERATE_ENTITY_PROPERTIES) list(APPEND GROUP_TYPES ${CURRENT_TYPE_CAPS}) endif() else() - string(REGEX MATCH ".*enum:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_ENUM ${LINE}) + string(REGEX MATCH ".*enum:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_ENUM ${LINE}) string(CONCAT GROUP_PROPERTY_ENUM "PROP_" ${CMAKE_MATCH_1}) list(APPEND ${CURRENT_TYPE}_PROPERTY_FLAGS ${GROUP_PROPERTY_ENUM}) - string(REGEX MATCH ".*prop:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_NAME ${LINE}) + string(REGEX MATCH ".*prop:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_NAME ${LINE}) set(GROUP_PROPERTY_NAME ${CMAKE_MATCH_1}) CAPITALIZE_FIRST_LETTER(${GROUP_PROPERTY_NAME}) set(GROUP_PROPERTY_NAME_CAPS ${CAPITALIZE_RESULT}) - string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_TYPE ${LINE}) + string(REGEX MATCH ".*type:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_TYPE ${LINE}) set(GROUP_PROPERTY_TYPE ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*default:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_DEFAULT ${LINE}) + string(REGEX MATCH ".*default:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_DEFAULT ${LINE}) set(GROUP_PROPERTY_DEFAULT ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*min:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_MIN ${LINE}) + string(REGEX MATCH ".*min:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_MIN ${LINE}) set(GROUP_PROPERTY_MIN ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*max:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_MAX ${LINE}) + string(REGEX MATCH ".*max:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_MAX ${LINE}) set(GROUP_PROPERTY_MAX ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*getter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_GETTER ${LINE}) + string(REGEX MATCH ".*getter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_GETTER ${LINE}) set(GROUP_PROPERTY_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*setter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_SETTER ${LINE}) + string(REGEX MATCH ".*setter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_SETTER ${LINE}) set(GROUP_PROPERTY_SETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*networkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_PROPERTY_NETWORK_GETTER ${LINE}) + string(REGEX MATCH ".*networkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_PROPERTY_NETWORK_GETTER ${LINE}) set(GROUP_PROPERTY_NETWORK_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableNetworkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_VARIABLE_NETWORK_GETTER ${LINE}) + string(REGEX MATCH ".*variableNetworkGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_VARIABLE_NETWORK_GETTER ${LINE}) set(GROUP_VARIABLE_NETWORK_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableNetworkSetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_VARIABLE_NETWORK_SETTER ${LINE}) + string(REGEX MATCH ".*variableNetworkSetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_VARIABLE_NETWORK_SETTER ${LINE}) set(GROUP_VARIABLE_NETWORK_SETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableCopyGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_VARIABLE_COPY_GETTER ${LINE}) + string(REGEX MATCH ".*variableCopyGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_VARIABLE_COPY_GETTER ${LINE}) set(GROUP_VARIABLE_COPY_GETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*variableCopySetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_VARIABLE_COPY_SETTER ${LINE}) + string(REGEX MATCH ".*variableCopySetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_VARIABLE_COPY_SETTER ${LINE}) set(GROUP_VARIABLE_COPY_SETTER ${CMAKE_MATCH_1}) - string(REGEX MATCH ".*debugGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+]+)( |,)" GROUP_VARIABLE_DEBUG_GETTER ${LINE}) + string(REGEX MATCH ".*debugGetter:+([A-Z0-9a-z_<>::\/\.\"\(\)\+\-]+)( |,)" GROUP_VARIABLE_DEBUG_GETTER ${LINE}) set(GROUP_VARIABLE_DEBUG_GETTER ${CMAKE_MATCH_1}) set(DEFINE_FUNC "DEFINE_PROPERTY_REF") @@ -522,7 +522,7 @@ macro(GENERATE_ENTITY_PROPERTIES) string(CONCAT ${CURRENT_TYPE_CAPS}_GROUP_SET_FROM "${${CURRENT_TYPE_CAPS}_GROUP_SET_FROM}" "\tSET_ENTITY_GROUP_PROPERTY_FROM_PROPERTIES(${CURRENT_TYPE_CAPS}, ${GROUP_PROPERTY_NAME_CAPS}, ${GROUP_PROPERTY_NAME}, set${GROUP_PROPERTY_NAME_CAPS});\n") endif() - if(ENTITY_PROPERTY_MIN AND ENTITY_PROPERTY_MAX) + if(DEFINED GROUP_PROPERTY_MIN AND DEFINED GROUP_PROPERTY_MAX) string(CONCAT ${CURRENT_TYPE_CAPS}_GROUP_ADD_TO_MAP "${${CURRENT_TYPE_CAPS}_GROUP_ADD_TO_MAP}" "\tADD_GROUP_PROPERTY_TO_MAP_WITH_RANGE(${GROUP_PROPERTY_ENUM}, ${CURRENT_TYPE}, ${GROUP_PROPERTY_NAME}, ${GROUP_PROPERTY_MIN}, ${GROUP_PROPERTY_MAX});\n") else() string(CONCAT ${CURRENT_TYPE_CAPS}_GROUP_ADD_TO_MAP "${${CURRENT_TYPE_CAPS}_GROUP_ADD_TO_MAP}" "\tADD_GROUP_PROPERTY_TO_MAP(${GROUP_PROPERTY_ENUM}, ${CURRENT_TYPE}, ${GROUP_PROPERTY_NAME});\n")