git.iko.soy/maciek134/podphoenix
on main help sign in
Got things building
commit75c0c4e278998ade60f89271c2d62e369e5e2242 authoriko <ilyakooo0@gmail.com> dateMon 25 Jul 2022, 12:21 (4 years ago) parentc633de3
5 files changed+9−9
compare with main
unifiedsplit
.gitignore+2 CMakeLists.txt+2−3 backend/CMakeLists.txt+2−2 clickable.json−4 clickable.yaml+3
.gitignorenew file+2
@@ -0,0 +1,2 @@
1+build
2+
CMakeLists.txt+2−3
@@ -1,5 +1,5 @@
11project(podbird C CXX)
2−cmake_minimum_required(VERSION 2.8.9)
2+cmake_minimum_required(VERSION 2.8.12)
33
44# Do not remove this line, its required for the correct functionality of the Ubuntu-SDK
55set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
@@ -24,7 +24,7 @@ execute_process(
2424option(INSTALL_TESTS "Install the tests on make install" on)
2525
2626set(APP_NAME podbird)
27−set(APP_ID "com.mikeasoft.podbird")
27+set(APP_ID "soy.iko.podphoenix")
2828if(DEFINED ENV{DESKTOP_BUILD})
2929 set(PODBIRD_DIR "/usr/share/podbird/qml/podbird")
3030 set(ICON "/usr/share/podbird/podbird.png")
@@ -87,4 +87,3 @@ add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend ${CMAK
8787
8888# No op custom target for all not compiled files, so they show up in the QtCreator project tree
8989add_custom_target("podbird_ClickFiles" ALL SOURCES "Podbird.apparmor" "manifest.json.in")
90−
backend/CMakeLists.txt+2−2
@@ -15,7 +15,8 @@ add_library(Podbirdbackend MODULE
1515set_target_properties(Podbirdbackend PROPERTIES
1616 LIBRARY_OUTPUT_DIRECTORY Podbird)
1717
18−qt5_use_modules(Podbirdbackend Gui Qml Quick)
18+# qt5_use_modules(Podbirdbackend Gui Qml Quick)
19+target_link_libraries(Podbirdbackend Qt5::Qml Qt5::Gui Qt5::Quick)
1920
2021# Copy qmldir file to build dir for running in QtCreator
2122add_custom_target(Podbirdbackend-qmldir ALL
@@ -26,4 +27,3 @@ add_custom_target(Podbirdbackend-qmldir ALL
2627# Install plugin file
2728install(TARGETS Podbirdbackend DESTINATION ${QT_IMPORTS_DIR}/Podbird/)
2829install(FILES modules/Podbird/qmldir DESTINATION ${QT_IMPORTS_DIR}/Podbird/)
29−
clickable.jsondeleted−4
@@ -1,4 +0,0 @@
1−{
2− "template": "cmake",
3− "kill": "qmlscene"
4−}
clickable.yamlnew file+3
@@ -0,0 +1,3 @@
1+clickable_minimum_required: 7.1.2
2+builder: cmake
3+kill: qmlscene