From 25b66942647cf6a186525afd3118bac2250ac068 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 16 Jun 2017 01:54:42 -0700 Subject: Rename FindOS_X_FRAMEWORKS.cmake for the new OS name. It's now FindMACOS_FRAMEWORKS.cmake. (But is it actually *used*? CMakeLists.txt does the check itself.) Change-Id: I6e972869b94da959dc7c9a3fccacfbd35e0e992c Reviewed-on: https://code.wireshark.org/review/22163 Reviewed-by: Guy Harris (cherry picked from commit a0dfbccdfca79da5ed9bc250d18bceedd3598276) Reviewed-on: https://code.wireshark.org/review/22164 --- cmake/modules/FindMACOS_FRAMEWORKS.cmake | 21 +++++++++++++++++++++ cmake/modules/FindOS_X_FRAMEWORKS.cmake | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 cmake/modules/FindMACOS_FRAMEWORKS.cmake delete mode 100644 cmake/modules/FindOS_X_FRAMEWORKS.cmake diff --git a/cmake/modules/FindMACOS_FRAMEWORKS.cmake b/cmake/modules/FindMACOS_FRAMEWORKS.cmake new file mode 100644 index 0000000000..119fa84f36 --- /dev/null +++ b/cmake/modules/FindMACOS_FRAMEWORKS.cmake @@ -0,0 +1,21 @@ +# +# - Find macOS frameworks +# Find various macOS frameworks if we're on macOS +# +# APPLE_APPLICATION_SERVICES_LIBRARY - ApplicationServices framework +# APPLE_CORE_FOUNDATION_LIBRARY - CoreFoundation frameowkr +# APPLE_SYSTEM_CONFIGURATION_LIBRARY - SystemConfiguration framework +# HAVE_MACOS_FRAMEWORKS - True if we're on macOS + + +if(APPLE) + # + # We assume that APPLE means macOS so that we have the macOS + # frameworks. + # + set(HAVE_MACOS_FRAMEWORKS 1) + set(MACOS_FRAMEWORKS_FOUND TRUE) + FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices) + FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation) + FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration) +endif() diff --git a/cmake/modules/FindOS_X_FRAMEWORKS.cmake b/cmake/modules/FindOS_X_FRAMEWORKS.cmake deleted file mode 100644 index 119fa84f36..0000000000 --- a/cmake/modules/FindOS_X_FRAMEWORKS.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# -# - Find macOS frameworks -# Find various macOS frameworks if we're on macOS -# -# APPLE_APPLICATION_SERVICES_LIBRARY - ApplicationServices framework -# APPLE_CORE_FOUNDATION_LIBRARY - CoreFoundation frameowkr -# APPLE_SYSTEM_CONFIGURATION_LIBRARY - SystemConfiguration framework -# HAVE_MACOS_FRAMEWORKS - True if we're on macOS - - -if(APPLE) - # - # We assume that APPLE means macOS so that we have the macOS - # frameworks. - # - set(HAVE_MACOS_FRAMEWORKS 1) - set(MACOS_FRAMEWORKS_FOUND TRUE) - FIND_LIBRARY (APPLE_APPLICATION_SERVICES_LIBRARY ApplicationServices) - FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation) - FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration) -endif() -- cgit v1.2.1