From a269a32a17866641f057c8f52348c1c9b4b95d7b Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Tue, 7 Sep 2021 00:54:27 -0600 Subject: [PATCH] Meta: Use Lagom:: namespaced names for code generators This will be required when we switch to a SuperBuild that has Lagom as a configure time dependency, but is a distinct enough change to be separate. --- CMakeLists.txt | 4 ++-- Meta/CMake/code_generators.cmake | 8 ++++---- Userland/Libraries/LibWeb/CMakeLists.txt | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e107f80d976..2ba11089bf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,10 +103,10 @@ add_custom_target(install-ports ) add_custom_target(configure-components - COMMAND "$" + COMMAND "$" USES_TERMINAL ) -add_dependencies(configure-components ConfigureComponents) +add_dependencies(configure-components Lagom::ConfigureComponents) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/Meta/CMake/code_generators.cmake b/Meta/CMake/code_generators.cmake index 9c505a0d180..cf1a7f045c4 100644 --- a/Meta/CMake/code_generators.cmake +++ b/Meta/CMake/code_generators.cmake @@ -22,11 +22,11 @@ function(compile_ipc source output) set(source ${CMAKE_CURRENT_SOURCE_DIR}/${source}) add_custom_command( OUTPUT ${output} - COMMAND $ ${source} > ${output}.tmp + COMMAND $ ${source} > ${output}.tmp COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${output}.tmp ${output} COMMAND "${CMAKE_COMMAND}" -E remove ${output}.tmp VERBATIM - DEPENDS IPCCompiler + DEPENDS Lagom::IPCCompiler MAIN_DEPENDENCY ${source} ) get_filename_component(output_name ${output} NAME) @@ -45,11 +45,11 @@ function(generate_state_machine source header) set(output ${CMAKE_CURRENT_BINARY_DIR}/${header}) add_custom_command( OUTPUT ${output} - COMMAND $ ${source} > ${output}.tmp + COMMAND $ ${source} > ${output}.tmp COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${output}.tmp ${output} COMMAND "${CMAKE_COMMAND}" -E remove ${output}.tmp VERBATIM - DEPENDS StateMachineGenerator + DEPENDS Lagom::StateMachineGenerator MAIN_DEPENDENCY ${source} ) add_custom_target(${target_name} DEPENDS ${output}) diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 01dff8d70c9..641756688d7 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -287,11 +287,11 @@ function(libweb_js_wrapper class) list(GET BINDINGS_TYPES ${iter} bindings_type) add_custom_command( OUTPUT "${bindings_src}" - COMMAND "$" "--${bindings_type}" "${CMAKE_CURRENT_SOURCE_DIR}/${class}.idl" > "${bindings_src}.tmp" + COMMAND "$" "--${bindings_type}" "${CMAKE_CURRENT_SOURCE_DIR}/${class}.idl" > "${bindings_src}.tmp" COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${bindings_src}.tmp" "${bindings_src}" COMMAND "${CMAKE_COMMAND}" -E remove "${bindings_src}.tmp" VERBATIM - DEPENDS WrapperGenerator + DEPENDS Lagom::WrapperGenerator MAIN_DEPENDENCY ${class}.idl ) endforeach() @@ -430,11 +430,11 @@ libweb_js_wrapper(URL/URLSearchParams) add_custom_command( OUTPUT CSS/PropertyID.h COMMAND ${CMAKE_COMMAND} -E make_directory CSS - COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.h.tmp + COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.h.tmp COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/PropertyID.h.tmp CSS/PropertyID.h COMMAND "${CMAKE_COMMAND}" -E remove CSS/PropertyID.h.tmp VERBATIM - DEPENDS Generate_CSS_PropertyID_h + DEPENDS Lagom::Generate_CSS_PropertyID_h MAIN_DEPENDENCY CSS/Properties.json ) add_custom_target(generate_PropertyID.h DEPENDS CSS/PropertyID.h) @@ -443,11 +443,11 @@ add_dependencies(all_generated generate_PropertyID.h) add_custom_command( OUTPUT CSS/PropertyID.cpp COMMAND ${CMAKE_COMMAND} -E make_directory CSS - COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.cpp.tmp + COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.cpp.tmp COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/PropertyID.cpp.tmp CSS/PropertyID.cpp COMMAND "${CMAKE_COMMAND}" -E remove CSS/PropertyID.cpp.tmp VERBATIM - DEPENDS Generate_CSS_PropertyID_cpp + DEPENDS Lagom::Generate_CSS_PropertyID_cpp MAIN_DEPENDENCY CSS/Properties.json ) add_custom_target(generate_PropertyID.cpp DEPENDS CSS/PropertyID.cpp) @@ -456,11 +456,11 @@ add_dependencies(all_generated generate_PropertyID.cpp) add_custom_command( OUTPUT CSS/ValueID.h COMMAND "${CMAKE_COMMAND}" -E make_directory CSS - COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.h.tmp + COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.h.tmp COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/ValueID.h.tmp CSS/ValueID.h COMMAND "${CMAKE_COMMAND}" -E remove CSS/ValueID.h.tmp VERBATIM - DEPENDS Generate_CSS_ValueID_h + DEPENDS Lagom::Generate_CSS_ValueID_h MAIN_DEPENDENCY CSS/Identifiers.json ) add_custom_target(generate_ValueID.h DEPENDS CSS/ValueID.h) @@ -469,11 +469,11 @@ add_dependencies(all_generated generate_ValueID.h) add_custom_command( OUTPUT CSS/ValueID.cpp COMMAND "${CMAKE_COMMAND}" -E make_directory CSS - COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.cpp.tmp + COMMAND "$" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.cpp.tmp COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/ValueID.cpp.tmp CSS/ValueID.cpp COMMAND "${CMAKE_COMMAND}" -E remove CSS/ValueID.cpp.tmp VERBATIM - DEPENDS Generate_CSS_ValueID_cpp + DEPENDS Lagom::Generate_CSS_ValueID_cpp MAIN_DEPENDENCY CSS/Identifiers.json ) add_custom_target(generate_ValueID.cpp DEPENDS CSS/ValueID.cpp)