[Project] Usage ninja build system. Fix CMakeLists.txt for qtcreator project tree.

8e2619d8 · OMP Education · ca61e3d0 · 8e2619d8 · 8e2619d8 · 8e2619d8
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,6 @@ install_manifest.txt
 *_autogen
 CMakeLists.txt.user*
 moc_*.cpp
-ru.auroraos.ApplicationTemplate
+ru.auroraos.StreamCamera
+build

--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -16,3 +16,5 @@
  * Reviewer, 2023
 * Oleg Shevchenko
  * Reviewer, 2023
+* Oksana Torosyan, <o.torosyan@omp.ru>
+  * Designer, 2024
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,11 +57,26 @@ set(HEADERS
    src/ycbcrtorgbimageconverter.h
 )

+
+FILE(GLOB TsFiles "translations/*.ts")
+
+FILE(GLOB QmlFiles "qml/**/*.qml" "qml/*.qml")
+
+file(GLOB_RECURSE IconFiles "icons/*.png")
+
+file(GLOB MdFiles "*.md")
+
 add_executable(${PROJECT_NAME}
    ${SOURCES}
    ${HEADERS}
    resources.qrc
    ${QmFiles}
+    ${QmlFiles}
+    ${TsFiles}
+    ${MdFiles}
+    ${IconFiles}
+    ${PROJECT_NAME}.desktop
+    rpm/${PROJECT_NAME}.spec
 )

 target_compile_definitions(${PROJECT_NAME} PRIVATE
@@ -115,22 +130,6 @@ install(FILES icons/172x172/${PROJECT_NAME}.png
    DESTINATION share/icons/hicolor/172x172/apps
 )

-# Get the other files reachable from the project tree in Qt Creator
-FILE(GLOB TsFiles "translations/*.ts")
-FILE(GLOB QmlFiles "qml/**/*.qml" "qml/*.qml")
-add_custom_target(distfiles
-    SOURCES
-        AUTHORS.md
-        CODE_OF_CONDUCT.md
-        CONTRIBUTING.md
-        LICENCE.BSD-3-Clause.md
-        README.md
-        README.ru.md
-        ${PROJECT_NAME}.desktop
-        ${QmlFiles}
-        ${TsFiles}
-        )
-
 file(WRITE "${CMAKE_BINARY_DIR}/QtCreatorDeployment.txt"
    "${CMAKE_INSTALL_PREFIX}
 ${CMAKE_BINARY_DIR}/${PROJECT_NAME}:bin

--- a/rpm/ru.auroraos.StreamCamera.spec
+++ b/rpm/ru.auroraos.StreamCamera.spec
@@ -18,6 +18,7 @@ BuildRequires:  pkgconfig(Qt5Multimedia)
 BuildRequires:  pkgconfig(streamcamera)
 BuildRequires:  pkgconfig(streamcamera-qt5)
 BuildRequires:  cmake
+BuildRequires:  ninja
 BuildRequires:  conan

 %description
@@ -31,11 +32,11 @@ CONAN_LIB_DIR="%{_builddir}/conan-libs/"
 conan install "%{_sourcedir}/.." --output-folder="$CONAN_LIB_DIR" --deployer=full_deploy -vwarning
 PKG_CONFIG_PATH="$CONAN_LIB_DIR:$PKG_CONFIG_PATH"
 export PKG_CONFIG_PATH
-%cmake
-%make_build
+%cmake -GNinja
+%ninja_build

 %install
-%make_install
+%ninja_install
 EXECUTABLE="%{buildroot}/%{_bindir}/%{name}"
 CONAN_LIB_DIR="%{_builddir}/conan-libs/"
 SHARED_LIBRARIES="%{buildroot}/%{_datadir}/%{name}/lib"

--- a/ru.auroraos.StreamCamera.desktop
+++ b/ru.auroraos.StreamCamera.desktop
@@ -11,6 +11,3 @@ Permissions=Camera;RemovableMedia;UserDirs;Downloads;MediaIndexing;Pictures;Scre
 OrganizationName=ru.auroraos
 ApplicationName=StreamCamera
 ExecDBus=/usr/bin/ru.auroraos.StreamCamera
-
-[X-Aurora-Application]
-IconMode=Crop