From 34134bfbf6184a80d433d1dd6c03553785b7938a Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Mon, 15 Sep 2014 19:38:18 +0200
Subject: [PATCH] Fix AppKit find module
---
cmake/Modules/FindAppKit.cmake | 20 +++++++-------------
obs/CMakeLists.txt | 2 +-
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/cmake/Modules/FindAppKit.cmake b/cmake/Modules/FindAppKit.cmake
index 355232160..1cc1e8451 100644
--- a/cmake/Modules/FindAppKit.cmake
+++ b/cmake/Modules/FindAppKit.cmake
@@ -1,18 +1,12 @@
# Once done these will be defined:
#
-# AppKit_FOUND
-# AppKit_LIBRARIES
-#
-
-if(AppKit_LIBRARIES)
- set(AppKit_FOUND TRUE)
-else()
- find_library(APPKIT_FRAMEWORK AppKit)
+# APPKIT_FOUND
+# APPKIT_LIBRARIES
- set(AppKit_LIBRARIES ${APPKIT_FRAMEWORK} CACHE STRING "AppKit framework")
+find_library(APPKIT_FRAMEWORK AppKit)
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(AppKit DEFAULT_MSG APPKIT_FRAMEWORK)
- mark_as_advanced(APPKIT_FRAMEWORK)
-endif()
+set(APPKIT_LIBRARIES ${APPKIT_FRAMEWORK})
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(AppKit DEFAULT_MSG APPKIT_FRAMEWORK)
+mark_as_advanced(APPKIT_FRAMEWORK)
diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt
index 40c7e472a..a8668418f 100644
--- a/obs/CMakeLists.txt
+++ b/obs/CMakeLists.txt
@@ -28,7 +28,7 @@ elseif(APPLE)
platform-osx.mm)
find_package(AppKit REQUIRED)
- set(obs_PLATFORM_LIBRARIES ${AppKit_LIBRARIES})
+ set(obs_PLATFORM_LIBRARIES ${APPKIT_LIBRARIES})
add_definitions(-fobjc-arc)
elseif(UNIX)
--
GitLab