From 02dfdd590d55f9316c6d9eb6e0cf94325fd3fdab Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 8 Apr 2021 13:50:32 +0200 Subject: [PATCH] Fix macOS bundle: set missing fields for test apps - MACOSX_BUNDLE_BUNDLE_NAME: CFBundleName - MACOSX_BUNDLE_GUI_IDENTIFIER: CFBundleIdentifier test/demo.cxx: Remove confusing quotes from demo variable output. --- CMake/fl_create_example.cmake | 5 ++++- test/demo.cxx | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMake/fl_create_example.cmake b/CMake/fl_create_example.cmake index 9053fa790..79ff68a7e 100644 --- a/CMake/fl_create_example.cmake +++ b/CMake/fl_create_example.cmake @@ -126,7 +126,10 @@ macro (CREATE_EXAMPLE NAME SOURCES LIBRARIES) if (PLIST) set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/${PLIST}") - endif (PLIST) + elseif (MAC_BUNDLE) + set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${TARGET_NAME}") + set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.fltk.${TARGET_NAME}") + endif (MAC_BUNDLE AND NOT PLIST) ############################################################################## # Copy macOS "bundle wrapper" (shell script) to target directory. diff --git a/test/demo.cxx b/test/demo.cxx index 14c86fccf..8e7982f26 100644 --- a/test/demo.cxx +++ b/test/demo.cxx @@ -1,7 +1,7 @@ // // Main demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2020 by Bill Spitzak and others. +// Copyright 1998-2021 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -139,7 +139,7 @@ const char *cmake_intdir = 0; // debug output function void debug_var(const char *varname, const char *value) { - tty->printf("%-10s = '%s'\n", varname, value); + tty->printf("%-10s = %s\n", varname, value); } // Show or hide the tty window