Browse Source

Fix AppKit find module

BtbN 11 years ago
parent
commit
34134bfbf6
2 changed files with 8 additions and 14 deletions
  1. 7 13
      cmake/Modules/FindAppKit.cmake
  2. 1 1
      obs/CMakeLists.txt

+ 7 - 13
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)

+ 1 - 1
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)