diff --git a/CMake b/CMake index fd634d9..7e515e2 160000 --- a/CMake +++ b/CMake @@ -1 +1 @@ -Subproject commit fd634d9f26e9760630d2ea0b7cd965f7d2b1e61b +Subproject commit 7e515e223118460b5e575bd4b7149439d8410ef8 diff --git a/CMakeLists.txt b/CMakeLists.txt index 020e9db..ac54173 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,14 +20,10 @@ if(TARGET ${PROJECT_NAME}) endif() cmake_minimum_required(VERSION 3.1) -#include(CMake/crossplatform/crossplatform.cmake) -include(CMake/ProjectOut.cmake) -include(CMake/ccache.cmake) +include(CMake/QuasarApp.cmake) include(CMake/Version.cmake) -include(CMake/QuasarAppCITargets.cmake) -include(CMake/QtUtils.cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_CXX_STANDARD 17) @@ -47,7 +43,7 @@ add_library(${PROJECT_NAME} ${SOURCE_CPP}) target_link_libraries(${PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Core) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -setVersion(1 4 5) +setVersion(1 4 6) initAll() addDoc(${PROJECT_NAME}Docs ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)