diff --git a/Libraries/LibGfx/CMakeLists.txt b/Libraries/LibGfx/CMakeLists.txt index f69ab9a096e..ff66fb25481 100644 --- a/Libraries/LibGfx/CMakeLists.txt +++ b/Libraries/LibGfx/CMakeLists.txt @@ -97,7 +97,7 @@ add_custom_command( ) target_sources(LibGfx PRIVATE ${generated_sources}) add_custom_target(generate_tiff_files_handler DEPENDS ${generated_sources}) -add_dependencies(all_generated generate_tiff_files_handler) +add_dependencies(ladybird_codegen_accumulator generate_tiff_files_handler) add_dependencies(LibGfx generate_tiff_files_handler) set(generated_headers ${generated_sources}) diff --git a/Meta/CMake/code_generators.cmake b/Meta/CMake/code_generators.cmake index 1240ca3bb54..150ead497c9 100644 --- a/Meta/CMake/code_generators.cmake +++ b/Meta/CMake/code_generators.cmake @@ -20,7 +20,7 @@ function(embed_as_string name source_file output source_variable_name) ) add_custom_target("generate_${name}" DEPENDS "${output}") - add_dependencies(all_generated "generate_${name}") + add_dependencies(ladybird_codegen_accumulator "generate_${name}") endfunction() function(generate_clang_module_map target_name) @@ -51,7 +51,7 @@ function(generate_clang_module_map target_name) ) add_custom_target("generate_${target_name}_module_map" DEPENDS "${module_map_file}") - add_dependencies(all_generated "generate_${target_name}_module_map") + add_dependencies(ladybird_codegen_accumulator "generate_${target_name}_module_map") add_dependencies("${target_name}" "generate_${target_name}_module_map") target_compile_options(${target_name} PUBLIC "SHELL:$<$:-Xcc -ivfsoverlay${vfs_overlay_file}>") @@ -72,7 +72,7 @@ function(compile_ipc source output) ) get_filename_component(output_name ${output} NAME) add_custom_target(generate_${output_name} DEPENDS ${output}) - add_dependencies(all_generated generate_${output_name}) + add_dependencies(ladybird_codegen_accumulator generate_${output_name}) cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR BASE_DIRECTORY ${SerenityOS_SOURCE_DIR} OUTPUT_VARIABLE current_source_dir_relative) if (ENABLE_INSTALL_HEADERS) diff --git a/Meta/CMake/libweb_generators.cmake b/Meta/CMake/libweb_generators.cmake index 1a59912c7b4..58fcfdc1534 100644 --- a/Meta/CMake/libweb_generators.cmake +++ b/Meta/CMake/libweb_generators.cmake @@ -243,7 +243,7 @@ function (generate_js_bindings target) ) add_custom_target(generate_${basename} DEPENDS ${BINDINGS_SOURCES}) - add_dependencies(all_generated generate_${basename}) + add_dependencies(ladybird_codegen_accumulator generate_${basename}) add_dependencies(${target} generate_${basename}) add_dependencies(generate_${basename} ${generated_idl_targets}) @@ -295,7 +295,7 @@ function (generate_js_bindings target) ) target_sources(${target} PRIVATE ${exposed_interface_sources}) add_custom_target(generate_exposed_interfaces DEPENDS ${exposed_interface_sources}) - add_dependencies(all_generated generate_exposed_interfaces) + add_dependencies(ladybird_codegen_accumulator generate_exposed_interfaces) add_dependencies(${target} generate_exposed_interfaces) add_dependencies(generate_exposed_interfaces ${generated_idl_targets}) diff --git a/Meta/CMake/targets.cmake b/Meta/CMake/targets.cmake index bc1cad78ea8..4867567e8b8 100644 --- a/Meta/CMake/targets.cmake +++ b/Meta/CMake/targets.cmake @@ -140,7 +140,7 @@ macro(add_ladybird_subdirectory path) add_subdirectory("${SERENITY_PROJECT_ROOT}/${path}" "${CMAKE_CURRENT_BINARY_DIR}/${path}") endmacro() -if (NOT TARGET all_generated) +if (NOT TARGET ladybird_codegen_accumulator) # Meta target to run all code-gen steps in the build. - add_custom_target(all_generated) + add_custom_target(ladybird_codegen_accumulator) endif() diff --git a/Meta/CMake/utils.cmake b/Meta/CMake/utils.cmake index 4ec2ed7532a..f9b5e724fc4 100644 --- a/Meta/CMake/utils.cmake +++ b/Meta/CMake/utils.cmake @@ -7,7 +7,7 @@ function(ladybird_generated_sources target_name) foreach(generated ${GENERATED_SOURCES}) get_filename_component(generated_name ${generated} NAME) add_dependencies(${target_name} generate_${generated_name}) - add_dependencies(all_generated generate_${generated_name}) + add_dependencies(ladybird_codegen_accumulator generate_${generated_name}) endforeach() endif() endfunction() @@ -53,7 +53,7 @@ function(invoke_generator_impl name generator primary_source header implementati ) add_custom_target("generate_${name}" DEPENDS "${header}" "${implementation}") - add_dependencies(all_generated "generate_${name}") + add_dependencies(ladybird_codegen_accumulator "generate_${name}") list(APPEND CURRENT_LIB_GENERATED "${name}") set(CURRENT_LIB_GENERATED ${CURRENT_LIB_GENERATED} PARENT_SCOPE) endfunction() @@ -101,8 +101,8 @@ function(invoke_idl_generator cpp_name idl_name generator primary_source header add_custom_target("generate_${cpp_name}" DEPENDS "${header}" "${implementation}" "${idl}") add_custom_target("generate_${idl_name}" DEPENDS "generate_${cpp_name}") - add_dependencies(all_generated "generate_${cpp_name}") - add_dependencies(all_generated "generate_${idl_name}") + add_dependencies(ladybird_codegen_accumulator "generate_${cpp_name}") + add_dependencies(ladybird_codegen_accumulator "generate_${idl_name}") list(APPEND CURRENT_LIB_GENERATED "${name}") set(CURRENT_LIB_GENERATED ${CURRENT_LIB_GENERATED} PARENT_SCOPE) endfunction() diff --git a/UI/cmake/ResourceFiles.cmake b/UI/cmake/ResourceFiles.cmake index 2aecbfc30fd..03fe7ad2785 100644 --- a/UI/cmake/ResourceFiles.cmake +++ b/UI/cmake/ResourceFiles.cmake @@ -136,7 +136,7 @@ function(copy_resource_set subdir) set(target_name "${target_name}_") endwhile() add_custom_target(${target_name} DEPENDS ${outputs}) - add_dependencies(all_generated ${target_name}) + add_dependencies(ladybird_codegen_accumulator ${target_name}) add_dependencies("${COPY_TARGET}_build_resource_files" ${target_name}) endif() endfunction()