From 24bd7e033e281e3e4523edd1d0a093b2201171b4 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 29 Feb 2020 15:36:54 -0800 Subject: [PATCH] Move some Mac specific cmake bits into new Mac.cmake --- CMakeLists.txt | 26 +------------------------- cmake/Mac.cmake | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 cmake/Mac.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index fadf3d1ce..04ceff6fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ IF(POLICY CMP0067) CMAKE_POLICY(SET CMP0067 NEW) ENDIF() -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") +INCLUDE(cmake/Mac.cmake) PROJECT(fish) @@ -165,30 +165,6 @@ ADD_DEFINITIONS(-D_REENTRANT) # Set up PCRE2 INCLUDE(cmake/PCRE2.cmake) -# Code signing ID on Mac. A default '-' is ad-hoc codesign. -SET(MAC_CODESIGN_ID "-" CACHE STRING "Mac code-signing identity") - -# Whether to inject the "get-task-allow" entitlement, which permits debugging -# on the Mac. -SET(MAC_INJECT_GET_TASK_ALLOW ON CACHE BOOL "Inject get-task-allow on Mac") - -FUNCTION(CODESIGN_ON_MAC target) - IF(APPLE) - IF(MAC_INJECT_GET_TASK_ALLOW) - SET(ENTITLEMENTS "--entitlements" "${CMAKE_SOURCE_DIR}/osx/fish_debug.entitlements") - ELSE() - SET(ENTITLEMENTS "") - ENDIF(MAC_INJECT_GET_TASK_ALLOW) - ADD_CUSTOM_COMMAND( - TARGET ${target} - POST_BUILD - COMMAND codesign --force --deep --options runtime ${ENTITLEMENTS} --sign "${MAC_CODESIGN_ID}" $ - VERBATIM - ) - ENDIF() -ENDFUNCTION(CODESIGN_ON_MAC target) - - # Define a function to link dependencies. FUNCTION(FISH_LINK_DEPS_AND_SIGN target) TARGET_LINK_LIBRARIES(${target} fishlib) diff --git a/cmake/Mac.cmake b/cmake/Mac.cmake new file mode 100644 index 000000000..cbe288a86 --- /dev/null +++ b/cmake/Mac.cmake @@ -0,0 +1,24 @@ +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") + +# Code signing ID on Mac. A default '-' is ad-hoc codesign. +SET(MAC_CODESIGN_ID "-" CACHE STRING "Mac code-signing identity") + +# Whether to inject the "get-task-allow" entitlement, which permits debugging +# on the Mac. +SET(MAC_INJECT_GET_TASK_ALLOW ON CACHE BOOL "Inject get-task-allow on Mac") + +FUNCTION(CODESIGN_ON_MAC target) + IF(APPLE) + IF(MAC_INJECT_GET_TASK_ALLOW) + SET(ENTITLEMENTS "--entitlements" "${CMAKE_SOURCE_DIR}/osx/fish_debug.entitlements") + ELSE() + SET(ENTITLEMENTS "") + ENDIF(MAC_INJECT_GET_TASK_ALLOW) + ADD_CUSTOM_COMMAND( + TARGET ${target} + POST_BUILD + COMMAND codesign --force --deep --options runtime ${ENTITLEMENTS} --sign "${MAC_CODESIGN_ID}" $ + VERBATIM + ) + ENDIF() +ENDFUNCTION(CODESIGN_ON_MAC target)