From 9d0117e415dcf9e1b50f6d15236fcc686af5842c Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Thu, 10 Oct 2024 12:20:54 +0200 Subject: [PATCH 1/2] Fix embedded glfw on macOS --- src/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3666426e..81e27c4c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -512,6 +512,11 @@ target_compile_features(threepp PUBLIC "cxx_std_20") if (UNIX) target_link_libraries(threepp PRIVATE pthread dl) endif () +if (APPLE) + target_link_libraries(threepp PRIVATE "-framework IOKit") + target_link_libraries(threepp PRIVATE "-framework Cocoa") + target_link_libraries(threepp PRIVATE "-framework OpenGL") +endif () target_include_directories(threepp PUBLIC "$" From 6e5ba3093c9eff026557f2d49019a4bb479f3a03 Mon Sep 17 00:00:00 2001 From: Lars Ivar Hatledal Date: Thu, 10 Oct 2024 12:38:22 +0200 Subject: [PATCH 2/2] precondition --- src/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 81e27c4c..d9ddb2b1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -512,11 +512,7 @@ target_compile_features(threepp PUBLIC "cxx_std_20") if (UNIX) target_link_libraries(threepp PRIVATE pthread dl) endif () -if (APPLE) - target_link_libraries(threepp PRIVATE "-framework IOKit") - target_link_libraries(threepp PRIVATE "-framework Cocoa") - target_link_libraries(threepp PRIVATE "-framework OpenGL") -endif () + target_include_directories(threepp PUBLIC "$" @@ -543,6 +539,11 @@ if (NOT DEFINED EMSCRIPTEN) target_link_libraries(threepp PRIVATE glfw::glfw) else () target_include_directories(threepp PRIVATE BEFORE SYSTEM "external/glfw/include") + if (APPLE) + target_link_libraries(threepp PRIVATE "-framework IOKit") + target_link_libraries(threepp PRIVATE "-framework Cocoa") + target_link_libraries(threepp PRIVATE "-framework OpenGL") + endif () endif () endif ()