Merge pull request #30 from QuasarApp/update_cmake

update cmake
This commit is contained in:
Andrei Yankovich 2021-04-20 11:54:35 +03:00 committed by GitHub
commit aab6cca7f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions

2
CMake

@ -1 +1 @@
Subproject commit fd634d9f26e9760630d2ea0b7cd965f7d2b1e61b
Subproject commit 7e515e223118460b5e575bd4b7149439d8410ef8

View File

@ -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)