mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-11 13:36:13 +03:00
CMake: Quote all CMAKE_COMMAND occurences
Building might fail if the cmake command path contains whitespace. See https://stackoverflow.com/a/35853080.
This commit is contained in:
parent
65dff8656e
commit
c56cbf8027
Notes:
sideshowbarker
2024-07-17 07:33:07 +09:00
Author: https://github.com/demostanis Commit: https://github.com/SerenityOS/serenity/commit/c56cbf8027 Pull-request: https://github.com/SerenityOS/serenity/pull/15111 Reviewed-by: https://github.com/ADKaster ✅
@ -89,12 +89,12 @@ add_custom_target(qemu-image
|
|||||||
USES_TERMINAL
|
USES_TERMINAL
|
||||||
)
|
)
|
||||||
add_custom_target(grub-image
|
add_custom_target(grub-image
|
||||||
COMMAND ${CMAKE_COMMAND} -E env "SERENITY_SOURCE_DIR=${SerenityOS_SOURCE_DIR}" "SERENITY_ARCH=${SERENITY_ARCH}" "SERENITY_TOOLCHAIN=${CMAKE_CXX_COMPILER_ID}" "LLVM_VERSION=${CMAKE_CXX_COMPILER_VERSION}" "${SerenityOS_SOURCE_DIR}/Meta/build-image-grub.sh"
|
COMMAND "${CMAKE_COMMAND}" -E env "SERENITY_SOURCE_DIR=${SerenityOS_SOURCE_DIR}" "SERENITY_ARCH=${SERENITY_ARCH}" "SERENITY_TOOLCHAIN=${CMAKE_CXX_COMPILER_ID}" "LLVM_VERSION=${CMAKE_CXX_COMPILER_VERSION}" "${SerenityOS_SOURCE_DIR}/Meta/build-image-grub.sh"
|
||||||
BYPRODUCTS ${CMAKE_BINARY_DIR}/grub_disk_image
|
BYPRODUCTS ${CMAKE_BINARY_DIR}/grub_disk_image
|
||||||
USES_TERMINAL
|
USES_TERMINAL
|
||||||
)
|
)
|
||||||
add_custom_target(limine-image
|
add_custom_target(limine-image
|
||||||
COMMAND ${CMAKE_COMMAND} -E env "SERENITY_SOURCE_DIR=${SerenityOS_SOURCE_DIR}" "SERENITY_ARCH=${SERENITY_ARCH}" "SERENITY_TOOLCHAIN=${CMAKE_CXX_COMPILER_ID}" "LLVM_VERSION=${CMAKE_CXX_COMPILER_VERSION}" "${SerenityOS_SOURCE_DIR}/Meta/build-image-limine.sh"
|
COMMAND "${CMAKE_COMMAND}" -E env "SERENITY_SOURCE_DIR=${SerenityOS_SOURCE_DIR}" "SERENITY_ARCH=${SERENITY_ARCH}" "SERENITY_TOOLCHAIN=${CMAKE_CXX_COMPILER_ID}" "LLVM_VERSION=${CMAKE_CXX_COMPILER_VERSION}" "${SerenityOS_SOURCE_DIR}/Meta/build-image-limine.sh"
|
||||||
BYPRODUCTS ${CMAKE_BINARY_DIR}/limine_disk_image
|
BYPRODUCTS ${CMAKE_BINARY_DIR}/limine_disk_image
|
||||||
USES_TERMINAL
|
USES_TERMINAL
|
||||||
)
|
)
|
||||||
|
@ -672,8 +672,8 @@ endif()
|
|||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET Kernel POST_BUILD
|
TARGET Kernel POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E env NM=${CMAKE_NM} sh ${CMAKE_CURRENT_SOURCE_DIR}/mkmap.sh
|
COMMAND "${CMAKE_COMMAND}" -E env NM=${CMAKE_NM} sh ${CMAKE_CURRENT_SOURCE_DIR}/mkmap.sh
|
||||||
COMMAND ${CMAKE_COMMAND} -E env OBJCOPY=${CMAKE_OBJCOPY} sh ${CMAKE_CURRENT_SOURCE_DIR}/embedmap.sh
|
COMMAND "${CMAKE_COMMAND}" -E env OBJCOPY=${CMAKE_OBJCOPY} sh ${CMAKE_CURRENT_SOURCE_DIR}/embedmap.sh
|
||||||
COMMAND ${CMAKE_OBJCOPY} --only-keep-debug Kernel Kernel.debug
|
COMMAND ${CMAKE_OBJCOPY} --only-keep-debug Kernel Kernel.debug
|
||||||
COMMAND ${CMAKE_OBJCOPY} --strip-debug Kernel
|
COMMAND ${CMAKE_OBJCOPY} --strip-debug Kernel
|
||||||
COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=Kernel.debug Kernel
|
COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=Kernel.debug Kernel
|
||||||
|
@ -107,27 +107,27 @@ add_library(crt0 STATIC crt0.cpp)
|
|||||||
target_link_libraries(crt0 PRIVATE NoCoverage)
|
target_link_libraries(crt0 PRIVATE NoCoverage)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET crt0
|
TARGET crt0
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_OBJECTS:crt0> ${CMAKE_INSTALL_PREFIX}/usr/lib/crt0.o
|
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_OBJECTS:crt0> ${CMAKE_INSTALL_PREFIX}/usr/lib/crt0.o
|
||||||
)
|
)
|
||||||
add_library(crt0_shared STATIC crt0_shared.cpp)
|
add_library(crt0_shared STATIC crt0_shared.cpp)
|
||||||
target_link_libraries(crt0_shared PRIVATE NoCoverage)
|
target_link_libraries(crt0_shared PRIVATE NoCoverage)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET crt0_shared
|
TARGET crt0_shared
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_OBJECTS:crt0_shared> ${CMAKE_INSTALL_PREFIX}/usr/lib/crt0_shared.o
|
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_OBJECTS:crt0_shared> ${CMAKE_INSTALL_PREFIX}/usr/lib/crt0_shared.o
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(crti STATIC ${CRTI_SOURCE})
|
add_library(crti STATIC ${CRTI_SOURCE})
|
||||||
target_link_libraries(crti PRIVATE NoCoverage)
|
target_link_libraries(crti PRIVATE NoCoverage)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET crti
|
TARGET crti
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_OBJECTS:crti> ${CMAKE_INSTALL_PREFIX}/usr/lib/crti.o
|
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_OBJECTS:crti> ${CMAKE_INSTALL_PREFIX}/usr/lib/crti.o
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library(crtn STATIC ${CRTN_SOURCE})
|
add_library(crtn STATIC ${CRTN_SOURCE})
|
||||||
target_link_libraries(crtn PRIVATE NoCoverage)
|
target_link_libraries(crtn PRIVATE NoCoverage)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET crtn
|
TARGET crtn
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_OBJECTS:crtn> ${CMAKE_INSTALL_PREFIX}/usr/lib/crtn.o
|
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_OBJECTS:crtn> ${CMAKE_INSTALL_PREFIX}/usr/lib/crtn.o
|
||||||
)
|
)
|
||||||
|
|
||||||
set_source_files_properties (ssp.cpp PROPERTIES COMPILE_FLAGS
|
set_source_files_properties (ssp.cpp PROPERTIES COMPILE_FLAGS
|
||||||
@ -136,7 +136,7 @@ add_library(ssp STATIC ssp.cpp)
|
|||||||
target_link_libraries(ssp PRIVATE NoCoverage)
|
target_link_libraries(ssp PRIVATE NoCoverage)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET ssp
|
TARGET ssp
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_OBJECTS:ssp> ${CMAKE_INSTALL_PREFIX}/usr/lib/ssp.o
|
COMMAND "${CMAKE_COMMAND}" -E copy $<TARGET_OBJECTS:ssp> ${CMAKE_INSTALL_PREFIX}/usr/lib/ssp.o
|
||||||
)
|
)
|
||||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libssp.a DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/lib/)
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libssp.a DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/lib/)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user