Merge pull request #11 from QuasarApp/updateCMake

update cmake

CMakeLists.txt

@@ -23,11 +23,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
 
-include(submodules/CMake/ccache.cmake)
-include(submodules/CMake/QuasarAppCITargets.cmake)
-
-# Add sub directories
-add_subdirectory(src)
+include(submodules/CMake/QuasarApp.cmake)
 
 if (NOT DEFINED RENAME_ME_TESTS)
     set(RENAME_ME_TESTS ON)
@@ -47,6 +43,23 @@ if (NOT DEFINED RENAME_ME_TESTS)
     endif()
 endif()
 
+if (NOT DEFINED RENAME_ME_EXAMPLE)
+    set(RENAME_ME_EXAMPLE ON)
+
+    if (ANDROID)
+        set(RENAME_ME_EXAMPLE OFF)
+    endif()
+
+    if (NOT QT_VERSION_MAJOR)
+        set(RENAME_ME_EXAMPLE OFF)
+    endif()
+endif()
+
+add_subdirectory(src/Library)
+
+if (DEFINED RENAME_ME_EXAMPLE)
+    add_subdirectory(src/Example)
+endif()
 
 if (RENAME_ME_TESTS)
     add_subdirectory(tests)

src/CMakeLists.txt

@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2020-2021 QuasarApp.
-# Distributed under the lgplv3 software license, see the accompanying
-# Everyone is permitted to copy and distribute verbatim copies
-# of this license document, but changing it is not allowed.
-#
-
-cmake_minimum_required(VERSION 3.14)
-
-
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-
-include(../submodules/CMake/ProjectOut.cmake)
-include(../submodules/CMake/Version.cmake)
-include(../submodules/CMake/QtUtils.cmake)
-include(../submodules/CMake/crossplatform/crossplatform.cmake)
-
-add_subdirectory(Library)
-add_subdirectory(Example)

src/Library/CMakeLists.txt

@@ -42,7 +42,5 @@ set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts)
 
 prepareQM(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
 
-setVersion(0 0 1)
-
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE)
 

src/Library/RENAME_ME.qrc

@@ -3,4 +3,7 @@
         <file>RENAME_MEModule/qmldir</file>
         <file>RENAME_MEModule/RENAME_ME.qml</file>
     </qresource>
+    <qresource prefix="/RENAME_METr">
+        <file>languages/en.qm</file>
+    </qresource>
 </RCC>

submodules/CMake

@@ -1 +1 @@
-Subproject commit b4a8d3e99cd3779fd8abf0decd0c21b04f435f92
+Subproject commit cd05493c3a43b04f26c3e3432df4283eb4509d8c

tests/CMakeLists.txt

@@ -9,9 +9,6 @@ cmake_minimum_required(VERSION 3.14)
 
 set(CURRENT_PROJECT ${PROJECT_NAME}Test)
 
-include(../submodules/CMake/ProjectOut.cmake)
-
-
 file(GLOB SOURCE_CPP
     "*.cpp" "*.qrc"
     "units/*.cpp" "units/*.qrc"