浏览代码

CMake: Mark all system macOS frameworks as advanced variables

It should be extremely unusual to want to change these, and they are just cluttering up the CMake GUI.
rdb 5 年之前
父节点
当前提交
abe3c2bf0b
共有 3 个文件被更改,包括 9 次插入0 次删除
  1. 4 0
      cmake/modules/FindFFMPEG.cmake
  2. 2 0
      dtool/src/dtoolutil/CMakeLists.txt
  3. 3 0
      panda/src/cocoadisplay/CMakeLists.txt

+ 4 - 0
cmake/modules/FindFFMPEG.cmake

@@ -128,6 +128,10 @@ if(APPLE)
   if(APPLE_BZ2_LIBRARY)
     list(APPEND FFMPEG_LIBRARIES "${APPLE_BZ2_LIBRARY}")
   endif()
+
+  mark_as_advanced(APPLE_AUDIOTOOLBOX_LIBRARY APPLE_COREMEDIA_LIBRARY
+    APPLE_COREVIDEO_LIBRARY APPLE_SECURITY_LIBRARY APPLE_VDA_LIBRARY
+    APPLE_VIDEOTOOLBOX_LIBRARY APPLE_ICONV_LIBRARY APPLE_BZ2_LIBRARY)
 endif()
 
 mark_as_advanced(FFMPEG_LIBRARY_DIR)

+ 2 - 0
dtool/src/dtoolutil/CMakeLists.txt

@@ -82,6 +82,8 @@ if(APPLE)
   find_library(FOUNDATION_LIBRARY Foundation)
   find_library(APPKIT_LIBRARY AppKit)
   target_link_libraries(p3dtoolutil ${FOUNDATION_LIBRARY} ${APPKIT_LIBRARY})
+
+  mark_as_advanced(FOUNDATION_LIBRARY APPKIT_LIBRARY)
 endif()
 
 # These are all used by executionEnvironment.cxx/filename.cxx

+ 3 - 0
panda/src/cocoadisplay/CMakeLists.txt

@@ -42,6 +42,9 @@ target_link_libraries(p3cocoadisplay
   ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY} ${CARBON_LIBRARY}
   ${CORE_VIDEO_LIBRARY})
 
+mark_as_advanced(
+  APPLICATIONSERVICES_LIBRARY APPKIT_LIBRARY CARBON_LIBRARY CORE_VIDEO_LIBRARY)
+
 if(NOT BUILD_METALIBS)
   install(TARGETS p3cocoadisplay EXPORT OpenGL COMPONENT OpenGL DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()