From d7e102f766b4dcc6c1c12951facb52d0d2aa09b1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 15 Aug 2021 17:06:34 +0200 Subject: [PATCH] Reuse Info.plist used by configure for CMake too The CMake-specific file is almost identical to the file used by configure now, so don't keep both of them when just one could do. --- build/cmake/functions.cmake | 2 +- samples/Info.plist.in | 32 -------------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 samples/Info.plist.in diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 52fefbd5c3..3604ab2cee 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -869,7 +869,7 @@ function(wx_add name group) if(APPLE) if(NOT IPHONE) set_target_properties(${target_name} PROPERTIES - MACOSX_BUNDLE_INFO_PLIST "${wxSOURCE_DIR}/samples/Info.plist.in" + MACOSX_BUNDLE_INFO_PLIST "${wxSOURCE_DIR}/src/osx/carbon/Info.plist.in" RESOURCE "${wxSOURCE_DIR}/src/osx/carbon/wxmac.icns") endif() set_target_properties(${target_name} PROPERTIES diff --git a/samples/Info.plist.in b/samples/Info.plist.in deleted file mode 100644 index 2fb92685f2..0000000000 --- a/samples/Info.plist.in +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${MACOSX_BUNDLE_EXECUTABLE_NAME} - CFBundleGetInfoString - ${MACOSX_BUNDLE_INFO_STRING} - CFBundleIconFile - ${MACOSX_BUNDLE_ICON_FILE} - CFBundleIdentifier - ${MACOSX_BUNDLE_GUI_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleLongVersionString - ${MACOSX_BUNDLE_LONG_VERSION_STRING} - CFBundleName - ${MACOSX_BUNDLE_BUNDLE_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - ${MACOSX_BUNDLE_SHORT_VERSION_STRING} - CFBundleVersion - ${MACOSX_BUNDLE_BUNDLE_VERSION} - NSHumanReadableCopyright - ${MACOSX_BUNDLE_COPYRIGHT} - NSPrincipalClass - wxNSApplication - -