Hopefully fix on newer OSX versions

bitfieldaudio · Aug 21, 2018 · 6178cd8 · 6178cd8
1 parent 4e02e96
commit 6178cd8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/boards/parts/ui/glfw/config.cmake b/boards/parts/ui/glfw/config.cmake
@@ -4,9 +4,11 @@ gl3w_gen("${OTTO_EXTERNAL_DIR}/")
 
 # GLFW
 find_package(glfw3)
-if (glfw3_FOUND)
+if (NOT glfw3_FOUND)
     message("Using system GLFW")
-    target_link_libraries(glfw INTERFACE dl)
+    if(NOT APPLE) 
+        target_link_libraries(glfw INTERFACE dl)
+    endif()
 else() 
     message("GLFW not found, building from source")
     set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Build GLFW examples")
@@ -16,3 +18,4 @@ else()
 endif()
 
 target_link_libraries(otto PUBLIC glfw)
+
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -25,6 +25,8 @@ if (APPLE)
   find_package(OpenGL)
   target_include_directories(nanovg SYSTEM INTERFACE ${OPENGL_INCLUDE_DIR})
   target_link_libraries(nanovg INTERFACE ${OPENGL_LIBRARIES})
+  find_library(CORE_FOUNDATION CoreFoundation)
+  target_link_libraries(external ${CORE_FOUNDATION})
 endif()
 
 # NanoCanvas