Skip to content

Commit d08cfe8

Browse files
authored
Use TreeSheets as target identifier (#760)
The application name on Mac OS is determined by the directory name, i.e. TreeSheets.app which in CMake is determined by the target identifier.
1 parent 2662ab0 commit d08cfe8

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,28 +100,28 @@ endif()
100100

101101
if(APPLE)
102102
add_executable(
103-
treesheets
103+
TreeSheets
104104
MACOSX_BUNDLE
105105
src/main.cpp
106106
osx/App.icns
107107
)
108108
set_source_files_properties(osx/App.icns PROPERTIES
109109
MACOSX_PACKAGE_LOCATION "Resources")
110-
set_target_properties(treesheets PROPERTIES
110+
set_target_properties(TreeSheets PROPERTIES
111111
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/osx/Info.plist"
112112
)
113113
else()
114114
add_executable(
115-
treesheets
115+
TreeSheets
116116
src/main.cpp
117117
)
118118
endif()
119119

120-
target_include_directories(treesheets PUBLIC lobster/src)
121-
target_precompile_headers(treesheets PUBLIC src/stdafx.h)
120+
target_include_directories(TreeSheets PUBLIC lobster/src)
121+
target_precompile_headers(TreeSheets PUBLIC src/stdafx.h)
122122

123123
target_link_libraries(
124-
treesheets
124+
TreeSheets
125125
PRIVATE
126126
$<IF:$<BOOL:${TREESHEETS_WITH_STATIC_WXWIDGETS}>,
127127
wx::aui
@@ -137,7 +137,7 @@ target_link_libraries(
137137
########## TREESHEETS INSTALLATION SETTINGS ###############
138138

139139
if(LINUX)
140-
OPTION(TREESHEETS_RELOCATABLE_INSTALLATION "Install data relative to the treesheets binary, instead of respecting the Filesystem Hierarchy Standard" OFF)
140+
OPTION(TREESHEETS_RELOCATABLE_INSTALLATION "Install data relative to the TreeSheets binary, instead of respecting the Filesystem Hierarchy Standard" OFF)
141141
endif()
142142

143143
if(LINUX AND NOT TREESHEETS_RELOCATABLE_INSTALLATION)
@@ -150,24 +150,24 @@ if(LINUX AND NOT TREESHEETS_RELOCATABLE_INSTALLATION)
150150
set(TREESHEETS_FULL_PKGDATADIR ${CMAKE_INSTALL_FULL_DATADIR}/${CMAKE_PROJECT_NAME})
151151

152152
# Convert relative to absolute paths because only absolute paths are looked up on Linux
153-
target_compile_definitions(treesheets PRIVATE "LOCALEDIR=L\"${CMAKE_INSTALL_FULL_LOCALEDIR}\"")
154-
target_compile_definitions(treesheets PRIVATE "TREESHEETS_DOCDIR=\"${TREESHEETS_FULL_DOCDIR}\"")
155-
target_compile_definitions(treesheets PRIVATE "TREESHEETS_DATADIR=\"${TREESHEETS_FULL_PKGDATADIR}\"")
153+
target_compile_definitions(TreeSheets PRIVATE "LOCALEDIR=L\"${CMAKE_INSTALL_FULL_LOCALEDIR}\"")
154+
target_compile_definitions(TreeSheets PRIVATE "TREESHEETS_DOCDIR=\"${TREESHEETS_FULL_DOCDIR}\"")
155+
target_compile_definitions(TreeSheets PRIVATE "TREESHEETS_DATADIR=\"${TREESHEETS_FULL_PKGDATADIR}\"")
156156

157157
install(FILES linux/com.strlen.TreeSheets.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps)
158158
install(FILES linux/com.strlen.TreeSheets.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
159159
install(FILES linux/com.strlen.TreeSheets.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
160160
elseif(APPLE)
161161
set(TREESHEETS_BINDIR ${CMAKE_INSTALL_PREFIX})
162-
set(TREESHEETS_DOCDIR ${CMAKE_INSTALL_PREFIX}/treesheets.app/Contents/Resources)
163-
set(TREESHEETS_PKGDATADIR ${CMAKE_INSTALL_PREFIX}/treesheets.app/Contents/Resources)
162+
set(TREESHEETS_DOCDIR ${CMAKE_INSTALL_PREFIX}/TreeSheets.app/Contents/Resources)
163+
set(TREESHEETS_PKGDATADIR ${CMAKE_INSTALL_PREFIX}/TreeSheets.app/Contents/Resources)
164164
else()
165165
set(TREESHEETS_BINDIR ${CMAKE_INSTALL_PREFIX})
166166
set(TREESHEETS_DOCDIR ${CMAKE_INSTALL_PREFIX})
167167
set(TREESHEETS_PKGDATADIR ${CMAKE_INSTALL_PREFIX})
168168
endif()
169169

170-
install(TARGETS treesheets DESTINATION ${TREESHEETS_BINDIR})
170+
install(TARGETS TreeSheets DESTINATION ${TREESHEETS_BINDIR})
171171
install(DIRECTORY TS/docs DESTINATION ${TREESHEETS_DOCDIR})
172172
install(FILES TS/readme.html DESTINATION ${TREESHEETS_DOCDIR})
173173
install(DIRECTORY TS/examples DESTINATION ${TREESHEETS_DOCDIR})
@@ -198,7 +198,7 @@ elseif(APPLE)
198198
foreach(locale ${locales})
199199
install(
200200
FILES "TS/translations/${locale}/ts.mo"
201-
DESTINATION "${CMAKE_INSTALL_PREFIX}/treesheets.app/Contents/Resources/translations/${locale}.lproj"
201+
DESTINATION "${CMAKE_INSTALL_PREFIX}/TreeSheets.app/Contents/Resources/translations/${locale}.lproj"
202202
)
203203
endforeach()
204204
else()

linux/com.strlen.TreeSheets.desktop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Name=TreeSheets
55
GenericName=Hierarchical Spreadsheet
66
GenericName[it]=Fogli di Calcolo
77
Comment=A hierarchical spreadsheet / outliner productivity tool.
8-
TryExec=treesheets
9-
Exec=treesheets %f
8+
TryExec=TreeSheets
9+
Exec=TreeSheets %f
1010
Terminal=false
1111
Icon=com.strlen.TreeSheets
1212
MimeType=application/x-treesheets;

0 commit comments

Comments
 (0)