Skip to content

Commit 577aa32

Browse files
committed
Update README and CMakeLists
Expanded Installing section of README CMAKE_BUILD_TYPE defaults to Release if unset Runtime data is installed under share/sickle/ directory instead of directly into share/
1 parent 823ea1d commit 577aa32

11 files changed

Lines changed: 16 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ project("Sickle Editor"
2626
LANGUAGES CXX
2727
)
2828

29+
if(CMAKE_BUILD_TYPE STREQUAL "")
30+
message("CMAKE_BUILD_TYPE is unset, defaulting to Release")
31+
set(CMAKE_BUILD_TYPE Release)
32+
endif()
33+
34+
2935
# Application ID
3036
set(APPLICATION_ID com.github.treecase.sicklegtk)
3137
# GResource prefix
@@ -103,7 +109,7 @@ target_link_libraries(sickle PRIVATE
103109

104110

105111
install(TARGETS sickle)
106-
install(DIRECTORY lua-runtime TYPE DATA)
112+
install(DIRECTORY sickle TYPE DATA)
107113
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_ID}.desktop"
108114
DESTINATION share/applications
109115
)
@@ -112,7 +118,7 @@ if(WIN32)
112118
DESTINATION share/glib-2.0/schemas
113119
)
114120
else()
115-
install(FILES sicklegtk.gschema.xml
121+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sicklegtk.gschema.xml"
116122
DESTINATION share/glib-2.0/schemas
117123
RENAME ${APPLICATION_ID}.gschema.xml
118124
)

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ FL_LIBRARY:FILEPATH=C:/msys64/usr/lib/libfl.a
5050

5151
## Installing
5252

53+
To install to `/usr/local`, run:
54+
5355
```shell
5456
$ cmake --install .
57+
# To install somewhere else:
58+
$ cmake --install . --prefix=<install prefix>
5559
```
5660

57-
or,
61+
On Linux, you'll also have to install the settings schema:
5862

5963
```shell
60-
$ cmake --install . --prefix=<install path>
64+
$ glib-compile-schemas <install prefix>/share/glib-2.0/schemas
6165
```
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)