From 46382612cb475f268fc97380ec538a44eb11c52b Mon Sep 17 00:00:00 2001 From: boykopovar Date: Mon, 28 Sep 2026 23:15:22 +0300 Subject: [PATCH] fix(libcohtml): fix build libcohtml with target libs o linux --- core/libs/CMakeLists.txt | 11 +++++++++++ core/libs/prx/libcohtml/CMakeLists.txt | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/core/libs/CMakeLists.txt b/core/libs/CMakeLists.txt index aa3c058ffe..9a64bfbe79 100644 --- a/core/libs/CMakeLists.txt +++ b/core/libs/CMakeLists.txt @@ -107,6 +107,17 @@ foreach(LIB_DIR ${LIBS_DIRS}) endif() endforeach() +set(LIBCOHTML_PATCHED ${PATCHED_DIR}/libcohtml.prx) +set(LIBCOHTML_PROSPERO_PATCHED ${PATCHED_DIR}/libcohtml.Prospero.prx) +add_custom_command( + OUTPUT ${LIBCOHTML_PROSPERO_PATCHED} + COMMAND ${CMAKE_COMMAND} -E copy "${LIBCOHTML_PATCHED}" "${LIBCOHTML_PROSPERO_PATCHED}" + DEPENDS ${LIBCOHTML_PATCHED} + VERBATIM +) +add_custom_target(libcohtml_prospero DEPENDS ${LIBCOHTML_PROSPERO_PATCHED}) +list(APPEND PATCHED_OUTPUTS ${LIBCOHTML_PROSPERO_PATCHED}) + add_custom_target(libs DEPENDS ${PATCHED_OUTPUTS}) if(BUILD_TESTING) diff --git a/core/libs/prx/libcohtml/CMakeLists.txt b/core/libs/prx/libcohtml/CMakeLists.txt index f32848eb25..842799d34f 100644 --- a/core/libs/prx/libcohtml/CMakeLists.txt +++ b/core/libs/prx/libcohtml/CMakeLists.txt @@ -4,16 +4,3 @@ add_library(libcohtml SHARED EXCLUDE_FROM_ALL target_include_directories(libcohtml PRIVATE ${LIBS_INCLUDE_DIR}) set_target_properties(libcohtml PROPERTIES CXX_EXTENSIONS OFF) configure_windows_unwind(libcohtml) - -set(LIBCOHTML_PATCHED ${PATCHED_DIR}/libcohtml.prx) -set(LIBCOHTML_PROSPERO_PATCHED ${PATCHED_DIR}/libcohtml.Prospero.prx) -add_custom_command( - OUTPUT ${LIBCOHTML_PROSPERO_PATCHED} - COMMAND ${CMAKE_COMMAND} -E copy ${LIBCOHTML_PATCHED} ${LIBCOHTML_PROSPERO_PATCHED} - DEPENDS ${LIBCOHTML_PATCHED} - COMMENT "Providing libcohtml.Prospero.prx for DT_NEEDED" - VERBATIM -) -add_custom_target(libcohtml_prospero DEPENDS ${LIBCOHTML_PROSPERO_PATCHED}) -list(APPEND PATCHED_OUTPUTS ${LIBCOHTML_PROSPERO_PATCHED}) -set(PATCHED_OUTPUTS ${PATCHED_OUTPUTS} PARENT_SCOPE)