debug macos

Author: bramtayl

.github/workflows/workflow.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{matrix.os}}
     steps:
     - name: Download
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v4
 
     - name: Update Ubuntu
       if: matrix.os == 'ubuntu-24.04'
@@ -37,11 +37,11 @@ jobs:
 
     - name: Add MSVC to path on Windows
       if: matrix.os == 'windows-latest'
-      uses: ilammy/msvc-dev-cmd@v1.12.1
+      uses: ilammy/msvc-dev-cmd@v1
 
     - name: Install cmake on Windows
       if: matrix.os == 'windows-latest'
-      uses: lukka/get-cmake@v3.29.6
+      uses: lukka/get-cmake@latest
 
     - name: Install winget to get Windows packages
       if: matrix.os == 'windows-latest'
@@ -57,19 +57,19 @@ jobs:
 
     - name: Install Qt on Windows
       if: matrix.os == 'windows-latest'
-      uses: jurplel/install-qt-action@v4.0.0
+      uses: jurplel/install-qt-action@v4
       with:
         version: "6.6.3"
         cache: true
 
     - name: Install vcpkg packages
-      uses: lukka/run-vcpkg@v11.5
+      uses: lukka/run-vcpkg@v11
       with:
         vcpkgGitCommitId: '47364fbc300756f64f7876b549d9422d5f3ec0d3'
 
     - name: Restore soundfont files from the cache if available
       id: soundfont_step
-      uses: actions/cache@v4.0.2
+      uses: actions/cache@v4
       with:
         path: share
         key: ${{matrix.os}}-soundfont_cache
@@ -86,53 +86,47 @@ jobs:
         curl "${{env.instruments_url}}/MuseScore_General_License.md"
         --output "share/MuseScore_General_License.md"
     
-    - name: Configure with tests on Ubuntu
-      if: matrix.os == 'ubuntu-24.04'
+    - name: Configure with tests on Unix
+      if: matrix.os != 'windows-latest'
       run: >
         cmake -S . -B with_tests
         -DBUILD_TESTS=ON
-        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_BUILD_TYPE=Debug
         -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
         -DNO_REALTIME_AUDIO=ON
         -DTRACK_COVERAGE=ON
         -DVCPKG_OVERLAY_PORTS=$(pwd)/overlays/fluidsynth
 
-    - name: Configure with tests on MacOS
-      if: matrix.os == 'macos-latest'
-      run: >
-        cmake -S . -B with_tests
-        -DBUILD_TESTS=ON
-        -DCMAKE_BUILD_TYPE=Debug
-        -DNO_REALTIME_AUDIO=ON
-        -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
-        -DVCPKG_OVERLAY_PORTS=$(pwd)/overlays/fluidsynth
-
     - name: Configure with tests on Windows
       if: matrix.os == 'windows-latest'
       run: >
         cmake -S . -B with_tests
         -DBUILD_TESTS=ON
-        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_BUILD_TYPE=Debug
         -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
         -DNO_REALTIME_AUDIO=ON
 
     - name: Build with tests
-      run: cmake --build with_tests --config Release
+      run: cmake --build with_tests --config Debug
+    
+    - name: Start fonts server on MacOS
+      if: matrix.os == 'macos-latest'
+      run: sudo launchctl load -w /System/Library/LaunchAgents/com.apple.fontd.useragent.plist
 
-    - name: Test on Linux TODO test on MacOS
-      if: matrix.os == 'ubuntu-24.04'
-      run: cd with_tests; QT_QPA_PLATFORM=offscreen ctest --build-config Release --verbose
+    - name: Test on Unix
+      if: matrix.os != 'windows-latest'
+      run: cd with_tests; QT_QPA_PLATFORM=offscreen ctest --build-config Debug --verbose
 
     - name: Test on Windows
       if: matrix.os == 'windows-latest'
-      run: cd with_tests; ctest --build-config Release --verbose
+      run: cd with_tests; ctest --build-config Debug --verbose
 
     - name: Run gcovr
       if: matrix.os == 'ubuntu-24.04'
       run: gcovr --xml "coverage.xml"  --filter "$(pwd)/src/"
 
     - name: Upload code coverage
-      uses: codecov/codecov-action@v4.5.0
+      uses: codecov/codecov-action@v4
       if: matrix.os == 'ubuntu-24.04'
       with:
         files: ./coverage.xml
@@ -166,7 +160,6 @@ jobs:
         -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake
         -DCPACK_GENERATOR=ZIP
         -DCPACK_PACKAGE_FILE_NAME=Justly-Windows
-        -DCMAKE_VERBOSE_MAKEFILE=ON
 
     - name: Build without tests
       run: cmake --build without_tests --config Release
@@ -176,9 +169,8 @@ jobs:
 
     - name: Release on a new tag
       if: startsWith(github.ref, 'refs/tags/')
-      uses: softprops/action-gh-release@v2.0.6
+      uses: softprops/action-gh-release@v2
       with:
         files: |
           **/Justly-*.tar.gz
           **/Justly-*.zip
-

CMakeLists.txt

@@ -27,6 +27,26 @@ find_package(Qt6Widgets REQUIRED)
 
 qt_standard_project_setup()
 
+function(qt_deploy executable_name)
+    if (WIN32)
+        qt_generate_deploy_app_script(TARGET ${executable_name}
+            OUTPUT_SCRIPT script_file
+        )
+        install(SCRIPT ${script_file})
+    endif()
+endfunction()
+
+function(install_executable executable_name)
+    install(TARGETS ${executable_name})
+    qt_deploy(${executable_name})
+    if (LINUX)
+        set_target_properties(${executable_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")  
+    endif()
+    if (APPLE)
+        set_target_properties(${executable_name} PROPERTIES INSTALL_RPATH "@loader_path/../lib")  
+    endif()
+endfunction()
+
 if (INCLUDE_WHAT_YOU_USE)
     set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE 
         include-what-you-use
@@ -38,57 +58,45 @@ endif()
 if (MSVC)
     add_compile_options(/W4)
 else()
-    add_compile_options(-Wall -Wextra -Wpedantic)
+    add_compile_options(-Wall -Wextra -Wpedantic $<$<CONFIG:Debug>:-Og>)
 endif()
 
 if (TRACK_COVERAGE)
-    add_compile_options(-Og)
     add_compile_options(--coverage)
     add_link_options(--coverage)
 endif()
 
 qt_add_library(JustlyLibrary SHARED)
 
-# disable assertions for release
 target_compile_features(JustlyLibrary PRIVATE cxx_std_20)
-add_compile_definitions(JustlyLibrary PUBLIC $<$<CONFIG:Release>:QT_NO_DEBUG=1>)
+target_link_libraries(JustlyLibrary PUBLIC Qt6::Core)
+target_link_libraries(JustlyLibrary PRIVATE
+    FluidSynth::libfluidsynth
+    nlohmann_json::nlohmann_json
+    nlohmann_json_schema_validator::validator
+    Qt6::Gui
+    Qt6::Widgets
+)
 
+add_compile_definitions(JustlyLibrary PUBLIC $<$<CONFIG:Release>:QT_NO_DEBUG=1>)
+target_compile_definitions(JustlyLibrary PRIVATE JUSTLY_LIBRARY)
 if (NO_REALTIME_AUDIO)
     target_compile_definitions(JustlyLibrary PRIVATE NO_REALTIME_AUDIO)
 endif()
 
 add_subdirectory(include)
-
-target_sources(JustlyLibrary PRIVATE "src/justly.cpp")
-
-target_include_directories(JustlyLibrary PRIVATE src)
-
-# add source dir for build but not install interface
 target_include_directories(JustlyLibrary PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:include>
 )
 
-target_link_libraries(JustlyLibrary PUBLIC Qt6::Core)
-
-target_link_libraries(JustlyLibrary PRIVATE
-    FluidSynth::libfluidsynth
-    nlohmann_json::nlohmann_json
-    nlohmann_json_schema_validator::validator
-    Qt6::Gui
-    Qt6::Widgets
-)
-
-# for dllexport instead of dllimport
-target_compile_definitions(JustlyLibrary PRIVATE JUSTLY_LIBRARY)
+target_sources(JustlyLibrary PRIVATE "src/justly.cpp")
 
 install(TARGETS JustlyLibrary
     RUNTIME_DEPENDENCY_SET runtime_dependencies
     FILE_SET justly_public_headers
 )
-
 if (WIN32)
-    # on other platforms, these should be system libraries
     install(RUNTIME_DEPENDENCY_SET runtime_dependencies
         PRE_INCLUDE_REGEXES
             glib
@@ -106,43 +114,18 @@ if (WIN32)
             vorbisenc
         PRE_EXCLUDE_REGEXES .
         DIRECTORIES
-            # vcpkg libraries
             ${_VCPKG_INSTALLED_DIR}/{VCPKG_TARGET_TRIPLET}/lib
     )
-    # not getting picked up as a runtime dependency?
     find_package(FLAC REQUIRED)
     install(FILES $<TARGET_FILE:FLAC::FLAC> TYPE BIN)
 endif()
-
-function(qt_deploy executable_name)
-    if (WIN32)
-        qt_generate_deploy_app_script(TARGET ${executable_name}
-            OUTPUT_SCRIPT script_file
-        )
-        install(SCRIPT ${script_file})
-    endif()
-endfunction()
-
 qt_deploy(JustlyLibrary)
 install(DIRECTORY ${Justly_SOURCE_DIR}/share/ TYPE DATA)
 
-function(install_executable executable_name)
-    install(TARGETS ${executable_name})
-
-    qt_deploy(${executable_name})
-    if (LINUX)
-        set_target_properties(${executable_name} PROPERTIES INSTALL_RPATH "$ORIGIN/../lib")  
-    endif()
-    if (APPLE)
-        set_target_properties(${executable_name} PROPERTIES INSTALL_RPATH "@loader_path/../lib")  
-    endif()
-endfunction()
-
 qt_add_executable(Justly)
 target_sources(Justly PRIVATE bin/main.cpp)
 target_link_libraries(Justly PRIVATE JustlyLibrary Qt6::Core Qt6::Widgets)
 if (WIN32)
-    # suppress console window
     set_target_properties(Justly PROPERTIES WIN32_EXECUTABLE ON)
 endif()
 install_executable(Justly)
@@ -151,7 +134,6 @@ if (BUILD_TESTS)
     qt_add_executable(JustlyTests)
     target_sources(JustlyTests PRIVATE tests/test.cpp)
     target_include_directories(JustlyTests PRIVATE ${Justly_SOURCE_DIR})
-
     target_link_libraries(JustlyTests PRIVATE
         JustlyLibrary
         Qt6::Core
@@ -160,17 +142,13 @@ if (BUILD_TESTS)
         Qt6::Widgets
     )
     install_executable(JustlyTests)
-
     set(test_install_folder ${Justly_SOURCE_DIR}/test_install)
-
     add_custom_target(install_tests ALL
         COMMAND cmake --install ${CMAKE_CURRENT_BINARY_DIR}
         --prefix ${test_install_folder}
         --config $<CONFIG>
     )
     add_dependencies(install_tests JustlyLibrary Justly JustlyTests)
-
-    # test the installed app
     add_test(NAME run_tests COMMAND ${test_install_folder}/bin/JustlyTests)
 endif()
 

src/justly.cpp

@@ -3382,9 +3382,9 @@ void set_up() {
   auto icon_file = QDir(QCoreApplication::applicationDirPath())
                        .filePath("../share/Justly.svg");
   Q_ASSERT(QFile::exists(icon_file));
-  QIcon icon(icon_file);
-  if (!icon.isNull()) {
-    QApplication::setWindowIcon(icon);
+  QPixmap pixmap(icon_file);
+  if (!pixmap.isNull()) {
+    QApplication::setWindowIcon(QIcon(pixmap));
   }
 
   QMetaType::registerConverter<Rational, QString>([](const Rational &rational) {