From 2e12779a2114dbfad9e024b32e349438577a6741 Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Tue, 17 Aug 2021 22:08:55 +0200
Subject: [PATCH] CMake: update Info.plist variables

Use the same values as in build/bakefiles/mac_bundles.bkl.
Use the correct copyright year for in the Info.plist files.
---
 CMakeLists.txt              |  2 +-
 build/cmake/functions.cmake | 12 +++++++-----
 misc/scripts/inc_year       |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 348864030b..08b0207350 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,7 @@ math(EXPR wxSOVERSION_MAJOR "${WX_CURRENT} - ${WX_AGE}")
 set(wxSOVERSION ${wxSOVERSION_MAJOR}.${WX_AGE}.${WX_REVISION})
 
 set(wxVERSION ${wxMAJOR_VERSION}.${wxMINOR_VERSION}.${wxRELEASE_NUMBER})
-set(wxCOPYRIGHT "Copyright 1992-2021 wxWidgets")
+set(wxCOPYRIGHT "2002-2021 wxWidgets")
 
 project(wxWidgets VERSION ${wxVERSION})
 
diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake
index 0233138ead..638f1d24e7 100644
--- a/build/cmake/functions.cmake
+++ b/build/cmake/functions.cmake
@@ -878,12 +878,14 @@ function(wx_add name group)
                 RESOURCE "${wxSOURCE_DIR}/src/osx/carbon/wxmac.icns")
         endif()
         set_target_properties(${target_name} PROPERTIES
-            MACOSX_BUNDLE_ICON_FILE wxmac.icns
-            MACOSX_BUNDLE_LONG_VERSION_STRING "${wxVERSION}"
-            MACOSX_BUNDLE_SHORT_VERSION_STRING "${wxVERSION}"
-            MACOSX_BUNDLE_BUNDLE_VERSION "${wxVERSION}"
-            MACOSX_BUNDLE_COPYRIGHT "${wxCOPYRIGHT}"
             MACOSX_BUNDLE_GUI_IDENTIFIER "org.wxwidgets.${target_name}"
+            MACOSX_BUNDLE_EXECUTABLE_NAME "${target_name}"
+            MACOSX_BUNDLE_BUNDLE_NAME "${target_name}"
+            MACOSX_BUNDLE_COPYRIGHT "Copyright ${wxCOPYRIGHT}"
+            MACOSX_BUNDLE_BUNDLE_VERSION "${wxVERSION}"
+            MACOSX_BUNDLE_INFO_STRING "${target_name} version ${wxVERSION}, (c) ${wxCOPYRIGHT}"
+            MACOSX_BUNDLE_LONG_VERSION_STRING "${wxVERSION}, (c) ${wxCOPYRIGHT}"
+            MACOSX_BUNDLE_SHORT_VERSION_STRING "${wxMAJOR_VERSION}.${wxMINOR_VERSION}"
             )
     endif()
 
diff --git a/misc/scripts/inc_year b/misc/scripts/inc_year
index aac5fb0ee4..def1f29f8e 100755
--- a/misc/scripts/inc_year
+++ b/misc/scripts/inc_year
@@ -15,8 +15,7 @@ old_year=`expr $new_year - 1`
 echo "Updating dates to use $new_year instead of $old_year:"
 
 # Update copyright to extend to the new year.
-for f in CMakeLists.txt \
-         docs/doxygen/mainpages/copyright.h docs/doxygen/regen.sh \
+for f in docs/doxygen/mainpages/copyright.h docs/doxygen/regen.sh \
          interface/wx/aboutdlg.h interface/wx/generic/aboutdlgg.h \
          ; do
     run_sed $f "s/1992-$old_year/1992-$new_year/"
@@ -27,5 +26,6 @@ run_sed src/msw/version.rc "s/1993-$old_year/1993-$new_year/"
 run_sed src/common/utilscmn.cpp "s/1995-$old_year/1995-$new_year/"
 
 # And Mac files are much newer than that.
+run_sed CMakeLists.txt "s/2002-$old_year/2002-$new_year/"
 run_set build/bakefiles/mac_bundles.bkl "s/2002-$old_year/2002-$new_year/"
 run_sed samples/minimal/Info_cocoa.plist "s/2005-$old_year/2005-$new_year/"