Merge pull request #10 from QuasarApp/task_9

Fix build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "CMake"]
+	path = CMake
+	url = https://github.com/QuasarApp/CMake.git

CMake

@@ -0,0 +1 @@
+Subproject commit 80494ec0d1da475ab3085cb80ac861804b11bec5

CMake/ProjectOut.cmake

@@ -1,32 +0,0 @@
-#
-# Copyright (C) 2018-2021 QuasarApp.
-# Distributed under the MIT software license, see the accompanying
-# Everyone is permitted to copy and distribute verbatim copies
-# of this license document, but changing it is not allowed.
-#
-
-if(DEFINED PROJECT_OUT_SUPPORT)
-  return()
-else()
-  set(PROJECT_OUT_SUPPORT 1)
-endif()
-
-IF(NOT CMAKE_BUILD_TYPE)
-  SET(CMAKE_BUILD_TYPE Release)
-ENDIF(NOT CMAKE_BUILD_TYPE)
-
-SET(LIB_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE})
-
-message("${} LIB_OUTPUT_DIR = ${LIB_OUTPUT_DIR}")
-
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}/bin)
-
-message(STATUS "buid type    " ${CMAKE_BUILD_TYPE})
-message(STATUS "Project      " ${PROJECT_NAME})
-message(STATUS "c compiler   " ${CMAKE_C_COMPILER})
-message(STATUS "cxx compiler " ${CMAKE_CXX_COMPILER})
-message(STATUS "build shared " ${BUILD_SHARED_LIBS})
-message(STATUS "qmake exec   " ${QT_QMAKE_EXECUTABLE})

CMakeLists.txt

@@ -6,15 +6,38 @@
 #
 
 cmake_minimum_required(VERSION 3.5)
-project(LoginViewMain)
+project(LoginView LANGUAGES CXX)
-
+if(TARGET ${PROJECT_NAME})
-if(NOT DEFINED LOGINVIEW_EXAMPLES)
+  message("The ${PROJECT_NAME} arledy included in main Project")
-    set (LOGINVIEW_EXAMPLES ON)
+  return()
 endif()
 
+
+if (NOT DEFINED LOGINVIEW_EXAMPLES)
+    set(LOGINVIEW_EXAMPLES ON)
+
+    if (ANDROID)
+        set(LOGINVIEW_EXAMPLES OFF)
+    endif()
+endif()
+
+include(CMake/QuasarAppCITargets.cmake)
+include(CMake/ccache.cmake)
+include(CMake/QtUtils.cmake)
+include(CMake/ProjectOut.cmake)
+include(CMake/crossplatform/crossplatform.cmake)
+
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick Xml REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick Xml REQUIRED)
+
 # Add sub directories
 add_subdirectory(LoginView)
 
 if (LOGINVIEW_EXAMPLES)
     add_subdirectory(example)
 endif()
+
+
+initAll()
+
+addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)

LoginView/CMakeLists.txt

@@ -7,7 +7,6 @@
 
 cmake_minimum_required(VERSION 3.5)
 
-project(LoginView LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
@@ -17,19 +16,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_definitions(-DLOGIN_VIEW_LIBRARY)
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/ProjectOut.cmake)
-
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick Xml REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick Xml REQUIRED)
-
 file(GLOB SOURCE_CPP "src/*.cpp" "src/*.qrc")
 
-add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP})
+add_library(${PROJECT_NAME} ${SOURCE_CPP})
 
 target_compile_definitions(LoginView
   PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
 
-target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core Qt::Quick Qt::Xml)
+target_link_libraries(${PROJECT_NAME} PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Quick Qt${QT_VERSION_MAJOR}::Xml)
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 set(QML_IMPORT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "Qt Creator extra qml import paths")

plug.pro

@@ -0,0 +1,5 @@
+
+TEMPLATE = subdirs
+
+QMAKE_EXTRA_TARGETS += \
+    test