From abe3c2bf0be5f67ba5fdcab9e43fd0758445d9b6 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 19 Dec 2020 00:33:22 +0100 Subject: [PATCH] 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. --- cmake/modules/FindFFMPEG.cmake | 4 ++++ dtool/src/dtoolutil/CMakeLists.txt | 2 ++ panda/src/cocoadisplay/CMakeLists.txt | 3 +++ 3 files changed, 9 insertions(+) diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake index 43209e4dc5..f1752500b1 100644 --- a/cmake/modules/FindFFMPEG.cmake +++ b/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) diff --git a/dtool/src/dtoolutil/CMakeLists.txt b/dtool/src/dtoolutil/CMakeLists.txt index c3a43c319b..73beacff6c 100644 --- a/dtool/src/dtoolutil/CMakeLists.txt +++ b/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 diff --git a/panda/src/cocoadisplay/CMakeLists.txt b/panda/src/cocoadisplay/CMakeLists.txt index ed6e4ca521..92565f273d 100644 --- a/panda/src/cocoadisplay/CMakeLists.txt +++ b/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()