|
|
commit 693a420102d53e74f96dce795e40df656dcc50d7
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Tue May 4 19:22:18 2021 +0200
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Tue May 4 19:22:18 2021 +0200
CMake/macOS: Fix and improve bundle generation
Update copyright, fix some bundle items, fix icon directory.
CMake/fl_create_example.cmake | 2 +-
test/CMakeLists.txt | 6 +++---
test/mac-resources/blocks.plist | 2 +-
test/mac-resources/checkers.plist | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git CMake/fl_create_example.cmake CMake/fl_create_example.cmake
index 59a78d2..96c9102 100644
--- CMake/fl_create_example.cmake
+++ CMake/fl_create_example.cmake
@@ -100,7 +100,7 @@ macro (CREATE_EXAMPLE NAME SOURCES LIBRARIES)
# set macOS (icon) resource path if applicable
if (MAC_BUNDLE AND ICON_NAME)
- set (ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${TARGET_NAME}.app/Contents/Resources/${ICON_NAME}")
+ set (ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/mac-resources/${ICON_NAME}")
endif (MAC_BUNDLE AND ICON_NAME)
##############################################################################
diff --git test/CMakeLists.txt test/CMakeLists.txt
index d0abbb1..ed74674 100644
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -53,12 +53,12 @@ CREATE_EXAMPLE (arc arc.cxx fltk)
CREATE_EXAMPLE (animated animated.cxx fltk)
CREATE_EXAMPLE (ask ask.cxx fltk)
CREATE_EXAMPLE (bitmap bitmap.cxx fltk)
-CREATE_EXAMPLE (blocks "blocks.cxx;blocks.icns" "fltk;${AUDIOLIBS}")
+CREATE_EXAMPLE (blocks "blocks.cxx;blocks.plist;blocks.icns" "fltk;${AUDIOLIBS}")
CREATE_EXAMPLE (boxtype boxtype.cxx fltk)
CREATE_EXAMPLE (browser browser.cxx fltk)
CREATE_EXAMPLE (button button.cxx fltk)
CREATE_EXAMPLE (buttons buttons.cxx fltk)
-CREATE_EXAMPLE (checkers "checkers.cxx;checkers.icns" fltk)
+CREATE_EXAMPLE (checkers "checkers.cxx;checkers.plist;checkers.icns" fltk)
CREATE_EXAMPLE (clock clock.cxx fltk)
CREATE_EXAMPLE (colbrowser colbrowser.cxx fltk)
CREATE_EXAMPLE (color_chooser color_chooser.cxx fltk)
@@ -104,7 +104,7 @@ CREATE_EXAMPLE (resizebox resizebox.cxx fltk)
CREATE_EXAMPLE (rotated_text rotated_text.cxx fltk)
CREATE_EXAMPLE (scroll scroll.cxx fltk)
CREATE_EXAMPLE (subwindow subwindow.cxx fltk)
-CREATE_EXAMPLE (sudoku "sudoku.cxx;sudoku.icns;sudoku.rc" "fltk_images;fltk;${AUDIOLIBS}")
+CREATE_EXAMPLE (sudoku "sudoku.cxx;sudoku.plist;sudoku.icns;sudoku.rc" "fltk_images;fltk;${AUDIOLIBS}")
CREATE_EXAMPLE (symbols symbols.cxx fltk)
CREATE_EXAMPLE (tabs tabs.fl fltk)
CREATE_EXAMPLE (table table.cxx fltk)
diff --git test/mac-resources/blocks.plist test/mac-resources/blocks.plist
index 911e0fc..bb256be 100644
--- test/mac-resources/blocks.plist
+++ test/mac-resources/blocks.plist
@@ -8,7 +8,7 @@
<string>blocks</string>
<key>CFBundleIdentifier</key>
- <string>com.easysw.blocks</string>
+ <string>org.fltk.blocks</string>
<key>CFBundleVersion</key>
<string>1.0</string>
diff --git test/mac-resources/checkers.plist test/mac-resources/checkers.plist
index e92595a..66ec8d1 100644
--- test/mac-resources/checkers.plist
+++ test/mac-resources/checkers.plist
@@ -29,7 +29,7 @@
<string>APPL</string>
<key>CFBundleSignature</key>
- <string>FLSU</string>
+ <string>FLCK</string>
<key>CFBundleIconFile</key>
<string>checkers.icns</string>
[ Direct Link to Message ] | |
|
| |