From e8f6f91a5ff9475858d9fe1a5c968bc01b86ade0 Mon Sep 17 00:00:00 2001 From: gilzoide Date: Fri, 19 Apr 2024 16:30:12 -0300 Subject: [PATCH 1/2] Fix link Cocoa framework when building TORQUE_DYNAMIC_LIBRARY on macOS --- Engine/source/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt index 6f204ba325..00e7aaa908 100644 --- a/Engine/source/CMakeLists.txt +++ b/Engine/source/CMakeLists.txt @@ -372,6 +372,9 @@ if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING) add_library(TorqueEngine SHARED ${TORQUE_SOURCE_FILES}) target_compile_definitions(TorqueEngine PUBLIC ${TORQUE_COMPILE_DEFINITIONS}) target_link_libraries(TorqueEngine ${TORQUE_LINK_LIBRARIES}) + if (APPLE) + target_link_libraries(TorqueEngine "-framework Cocoa") + endif (APPLE) target_include_directories(TorqueEngine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES}) set(TORQUE_SOURCE_FILES "main/main.cpp") From 735fe4193ffdd39155e5204c6b33bed4c9a2c8b3 Mon Sep 17 00:00:00 2001 From: gilzoide Date: Fri, 19 Apr 2024 17:01:08 -0300 Subject: [PATCH 2/2] Link `TORQUE_LINK_FRAMEWORKS` instead of `-framework Cocoa` --- Engine/source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt index 00e7aaa908..590f6538ad 100644 --- a/Engine/source/CMakeLists.txt +++ b/Engine/source/CMakeLists.txt @@ -373,7 +373,7 @@ if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING) target_compile_definitions(TorqueEngine PUBLIC ${TORQUE_COMPILE_DEFINITIONS}) target_link_libraries(TorqueEngine ${TORQUE_LINK_LIBRARIES}) if (APPLE) - target_link_libraries(TorqueEngine "-framework Cocoa") + target_link_libraries(TorqueEngine ${TORQUE_LINK_FRAMEWORKS}) endif (APPLE) target_include_directories(TorqueEngine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES})