diff --git a/Meta/CMake/libweb_generators.cmake b/Meta/CMake/libweb_generators.cmake index 9d8b191d0f..584d114317 100644 --- a/Meta/CMake/libweb_generators.cmake +++ b/Meta/CMake/libweb_generators.cmake @@ -4,7 +4,6 @@ function (generate_css_implementation) "Enums.cpp" Lagom::GenerateCSSEnums "${LIBWEB_INPUT_FOLDER}/CSS/Enums.json" - "" "CSS/Enums.h" "CSS/Enums.cpp" arguments -j "${LIBWEB_INPUT_FOLDER}/CSS/Enums.json" @@ -14,7 +13,6 @@ function (generate_css_implementation) "MediaFeatureID.cpp" Lagom::GenerateCSSMediaFeatureID "${LIBWEB_INPUT_FOLDER}/CSS/MediaFeatures.json" - "" "CSS/MediaFeatureID.h" "CSS/MediaFeatureID.cpp" arguments -j "${LIBWEB_INPUT_FOLDER}/CSS/MediaFeatures.json" @@ -24,7 +22,6 @@ function (generate_css_implementation) "PropertyID.cpp" Lagom::GenerateCSSPropertyID "${LIBWEB_INPUT_FOLDER}/CSS/Properties.json" - "" "CSS/PropertyID.h" "CSS/PropertyID.cpp" arguments -j "${LIBWEB_INPUT_FOLDER}/CSS/Properties.json" @@ -34,7 +31,6 @@ function (generate_css_implementation) "TransformFunctions.cpp" Lagom::GenerateCSSTransformFunctions "${LIBWEB_INPUT_FOLDER}/CSS/TransformFunctions.json" - "" "CSS/TransformFunctions.h" "CSS/TransformFunctions.cpp" arguments -j "${LIBWEB_INPUT_FOLDER}/CSS/TransformFunctions.json" @@ -44,7 +40,6 @@ function (generate_css_implementation) "ValueID.cpp" Lagom::GenerateCSSValueID "${LIBWEB_INPUT_FOLDER}/CSS/Identifiers.json" - "" "CSS/ValueID.h" "CSS/ValueID.cpp" arguments -j "${LIBWEB_INPUT_FOLDER}/CSS/Identifiers.json" diff --git a/Meta/CMake/locale_data.cmake b/Meta/CMake/locale_data.cmake index 26fd91310e..a548ff67e6 100644 --- a/Meta/CMake/locale_data.cmake +++ b/Meta/CMake/locale_data.cmake @@ -59,7 +59,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "DateTimeFormatData" Lagom::GenerateDateTimeFormatData "${CLDR_VERSION_FILE}" - "" "${DATE_TIME_FORMAT_DATA_HEADER}" "${DATE_TIME_FORMAT_DATA_IMPLEMENTATION}" arguments -r "${CLDR_CORE_PATH}" -d "${CLDR_DATES_PATH}" @@ -68,7 +67,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "LocaleData" Lagom::GenerateLocaleData "${CLDR_VERSION_FILE}" - "" "${LOCALE_DATA_HEADER}" "${LOCALE_DATA_IMPLEMENTATION}" arguments -b "${CLDR_BCP47_PATH}" -r "${CLDR_CORE_PATH}" -l "${CLDR_LOCALES_PATH}" -m "${CLDR_MISC_PATH}" -n "${CLDR_NUMBERS_PATH}" -d "${CLDR_DATES_PATH}" @@ -77,7 +75,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "NumberFormatData" Lagom::GenerateNumberFormatData "${CLDR_VERSION_FILE}" - "" "${NUMBER_FORMAT_DATA_HEADER}" "${NUMBER_FORMAT_DATA_IMPLEMENTATION}" arguments -r "${CLDR_CORE_PATH}" -n "${CLDR_NUMBERS_PATH}" -u "${CLDR_UNITS_PATH}" @@ -86,7 +83,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "PluralRulesData" Lagom::GeneratePluralRulesData "${CLDR_VERSION_FILE}" - "" "${PLURAL_RULES_DATA_HEADER}" "${PLURAL_RULES_DATA_IMPLEMENTATION}" arguments -r "${CLDR_CORE_PATH}" -l "${CLDR_LOCALES_PATH}" @@ -95,7 +91,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "RelativeTimeFormatData" Lagom::GenerateRelativeTimeFormatData "${CLDR_VERSION_FILE}" - "" "${RELATIVE_TIME_FORMAT_DATA_HEADER}" "${RELATIVE_TIME_FORMAT_DATA_IMPLEMENTATION}" arguments -d "${CLDR_DATES_PATH}" diff --git a/Meta/CMake/pnp_ids.cmake b/Meta/CMake/pnp_ids.cmake index 7192d20c46..eb032726bd 100644 --- a/Meta/CMake/pnp_ids.cmake +++ b/Meta/CMake/pnp_ids.cmake @@ -8,13 +8,11 @@ if (ENABLE_PNP_IDS_DOWNLOAD) set(PNP_IDS_HEADER PnpIDs.h) set(PNP_IDS_IMPLEMENTATION PnpIDs.cpp) - set(PNP_IDS_TARGET_PREFIX "") invoke_generator( "PnpIDsData" Lagom::GeneratePnpIDsData "${PNP_IDS_EXPORT_PATH}" - "${PNP_IDS_TARGET_PREFIX}" "${PNP_IDS_HEADER}" "${PNP_IDS_IMPLEMENTATION}" arguments -p "${PNP_IDS_EXPORT_PATH}" diff --git a/Meta/CMake/time_zone_data.cmake b/Meta/CMake/time_zone_data.cmake index d95e32f760..ce93e263c1 100644 --- a/Meta/CMake/time_zone_data.cmake +++ b/Meta/CMake/time_zone_data.cmake @@ -72,7 +72,6 @@ if (ENABLE_TIME_ZONE_DATABASE_DOWNLOAD) "TimeZoneData" Lagom::GenerateTimeZoneData "${TZDB_VERSION_FILE}" - "" "TimeZoneData.h" "TimeZoneData.cpp" arguments -z "${TZDB_ZONE_1970_PATH}" "${TZDB_AFRICA_PATH}" "${TZDB_ANTARCTICA_PATH}" "${TZDB_ASIA_PATH}" "${TZDB_AUSTRALASIA_PATH}" "${TZDB_BACKWARD_PATH}" "${TZDB_ETCETERA_PATH}" "${TZDB_EUROPE_PATH}" "${TZDB_NORTH_AMERICA_PATH}" "${TZDB_SOUTH_AMERICA_PATH}" diff --git a/Meta/CMake/unicode_data.cmake b/Meta/CMake/unicode_data.cmake index 50b0d0a991..4af4325b0b 100644 --- a/Meta/CMake/unicode_data.cmake +++ b/Meta/CMake/unicode_data.cmake @@ -100,7 +100,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "UnicodeData" Lagom::GenerateUnicodeData "${UCD_VERSION_FILE}" - "" "${UNICODE_DATA_HEADER}" "${UNICODE_DATA_IMPLEMENTATION}" arguments -u "${UNICODE_DATA_PATH}" -s "${SPECIAL_CASING_PATH}" -g "${DERIVED_GENERAL_CATEGORY_PATH}" -p "${PROP_LIST_PATH}" -d "${DERIVED_CORE_PROP_PATH}" -b "${DERIVED_BINARY_PROP_PATH}" -a "${PROP_ALIAS_PATH}" -v "${PROP_VALUE_ALIAS_PATH}" -r "${SCRIPTS_PATH}" -x "${SCRIPT_EXTENSIONS_PATH}" -k "${BLOCKS_PATH}" -e "${EMOJI_DATA_PATH}" -m "${NAME_ALIAS_PATH}" -n "${NORM_PROPS_PATH}" -f "${GRAPHEME_BREAK_PROP_PATH}" -w "${WORD_BREAK_PROP_PATH}" -i "${SENTENCE_BREAK_PROP_PATH}" @@ -109,7 +108,6 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "EmojiData" Lagom::GenerateEmojiData "${UCD_VERSION_FILE}" - "" "${EMOJI_DATA_HEADER}" "${EMOJI_DATA_IMPLEMENTATION}" arguments -e "${EMOJI_TEST_PATH}" -s "${EMOJI_SERENITY_PATH}" diff --git a/Meta/CMake/utils.cmake b/Meta/CMake/utils.cmake index 07a2570952..7f923ea00c 100644 --- a/Meta/CMake/utils.cmake +++ b/Meta/CMake/utils.cmake @@ -177,7 +177,7 @@ function(remove_path_if_version_changed version version_file cache_path) endif() endfunction() -function(invoke_generator name generator version_file prefix header implementation) +function(invoke_generator name generator version_file header implementation) cmake_parse_arguments(invoke_generator "" "" "arguments" ${ARGN}) add_custom_command( @@ -190,8 +190,8 @@ function(invoke_generator name generator version_file prefix header implementati DEPENDS ${generator} "${version_file}" ) - add_custom_target("generate_${prefix}${name}" DEPENDS "${header}" "${implementation}") - add_dependencies(all_generated "generate_${prefix}${name}") + add_custom_target("generate_${name}" DEPENDS "${header}" "${implementation}") + add_dependencies(all_generated "generate_${name}") endfunction() function(download_file url path)