From 161cba9bbf5a3e6e49c44108479186a3bfa0ddbe Mon Sep 17 00:00:00 2001 From: Macbook Date: Wed, 9 Oct 2024 20:44:00 +0700 Subject: [PATCH] fix build on github --- client/CMakeLists.txt | 49 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 501e1e32..89921d15 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -401,33 +401,34 @@ if(NOT IOS AND NOT ANDROID AND NOT MACOS_NE) endif() target_sources(${PROJECT} PRIVATE ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC} ${I18NQRC}) -# Sao chép QtConcurrent.framework vào thư mục Frameworks -add_custom_command(TARGET ${PROJECT} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory - "$/Contents/Frameworks" - - COMMAND ${CMAKE_COMMAND} -E copy_directory - "/Users/macbook/Qt/6.8.0/macos/lib/QtConcurrent.framework" - "$/Contents/Frameworks/QtConcurrent.framework" - - COMMENT "Copying QtConcurrent.framework to the bundle's Frameworks directory" -) +# if(APPLE AND NOT ANDROID) +# # MacOS specific bundle operations +# add_custom_command(TARGET ${PROJECT} POST_BUILD +# COMMAND ${CMAKE_COMMAND} -E make_directory +# "$/Contents/Frameworks" +# COMMAND ${CMAKE_COMMAND} -E copy_directory +# "/Users/macbook/Qt/6.8.0/macos/lib/QtConcurrent.framework" +# "$/Contents/Frameworks/QtConcurrent.framework" -# Triển khai ứng dụng với macdeployqt và ký mã (nếu cần) -add_custom_command(TARGET ${PROJECT} POST_BUILD - COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $ -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} -) +# COMMENT "Copying QtConcurrent.framework to the bundle's Frameworks directory" +# ) -# Nếu ở chế độ Release, ký mã gói ứng dụng -if(CMAKE_BUILD_TYPE STREQUAL "Release") - SET(SIGN_CMD codesign --deep --force --sign 'Apple Distribution: Privacy Technologies OU \(X7UJ388FXK\)' --timestamp --options runtime $) - message("Manual signing bundle...") - message(${SIGN_CMD}) +# # MacOS specific application deployment +# add_custom_command(TARGET ${PROJECT} POST_BUILD +# COMMAND ${QT_BIN_DIR_DETECTED}/macdeployqt $ -appstore-compliant -qmldir=${CMAKE_CURRENT_SOURCE_DIR} +# ) - add_custom_command(TARGET ${PROJECT} POST_BUILD - COMMAND ${SIGN_CMD} - ) -endif() +# # MacOS specific code signing for Release +# if(CMAKE_BUILD_TYPE STREQUAL "Release") +# SET(SIGN_CMD codesign --deep --force --sign 'Apple Distribution: Privacy Technologies OU \(X7UJ388FXK\)' --timestamp --options runtime $) +# message("Manual signing bundle...") +# message(${SIGN_CMD}) + +# add_custom_command(TARGET ${PROJECT} POST_BUILD +# COMMAND ${SIGN_CMD} +# ) +# endif() +# endif() qt_finalize_target(${PROJECT})