Skip to content

Commit 2f93fcc

Browse files
committed
Merge branch 'main' into workflows
2 parents 6a5dbcc + 60f7551 commit 2f93fcc

File tree

4 files changed

+37
-1
lines changed

4 files changed

+37
-1
lines changed

.github/workflows/release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ jobs:
6666

6767
- name: Configure CMake (Windows)
6868
if: runner.os == 'Windows'
69-
run: cmake -B build -G Ninja -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -DRETUNER_CPACK=ON
69+
run: |
70+
cmake -B build -G Ninja `
71+
-DCMAKE_C_COMPILER=cl `
72+
-DCMAKE_CXX_COMPILER=cl `
73+
-DCMAKE_BUILD_TYPE=Release `
74+
-DRETUNER_CPACK=ON
7075
7176
- name: Configure CMake (macOS)
7277
if: runner.os == 'macOS'

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ project(retuner VERSION 1.1.0)
44
option(RETUNER_CPACK "Setup the build for CPack" OFF)
55
option(RETUNER_DMG "Build a DMG instead of a Mac Installer pkg" OFF)
66

7+
set(RETUNER_DESCRIPTION_SUMMARY, "A music retuning application and plugins")
8+
79
set(CMAKE_CXX_STANDARD 20)
810
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
911
set(CMAKE_OSX_ARCHITECTURES arm64;x86_64)

src/app/CMakeLists.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,24 @@ if(LINUX)
6464
set_target_properties(reTunerApp PROPERTIES
6565
OUTPUT_NAME "retuner"
6666
)
67+
68+
# Configure and install desktop file
69+
configure_file(
70+
${CMAKE_CURRENT_SOURCE_DIR}/retuner.desktop.in
71+
${CMAKE_CURRENT_BINARY_DIR}/retuner.desktop
72+
@ONLY
73+
)
74+
75+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/retuner.desktop
76+
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
77+
)
78+
79+
# Install icon if available
80+
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/retuner-icon.png)
81+
install(FILES retuner-icon.png
82+
DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/512x512/apps
83+
RENAME retuner.png
84+
)
85+
endif()
6786
endif()
6887

src/app/retuner.desktop.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[Desktop Entry]
2+
Version=1.0
3+
Type=Application
4+
Name=reTuner
5+
Comment=@RETUNER_DESCRIPTION_SUMMARY@
6+
Exec=@CMAKE_INSTALL_FULL_BINDIR@/retuner
7+
Icon=retuner
8+
Terminal=false
9+
Categories=AudioVideo;Audio;
10+
Keywords=audio;tuning;generator;test;tone;

0 commit comments

Comments
 (0)