QuasarApp/CMakeProject
Template
4
0
Fork 0
mirror of https://github.com/QuasarApp/CMakeProject.git synced 2025-04-29 15:14:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7 from QuasarApp/applayNewSubmodulesRules

Browse Source 
aplay new submodules rules
This commit is contained in:
Andrei Yankovich 2021-04-12 16:36:27 +03:00 committed by GitHub
commit aa4082ab27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

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

4
CMakeLists.txt
View File

@ -23,8 +23,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Test QUIET)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET)
include(CMake/ccache.cmake) include(submodules/CMake/ccache.cmake)
include(CMake/QuasarAppCITargets.cmake) include(submodules/CMake/QuasarAppCITargets.cmake)
# Add sub directories # Add sub directories
add_subdirectory(src) add_subdirectory(src)

8
src/CMakeLists.txt
View File

@ -17,10 +17,10 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
include(../CMake/ProjectOut.cmake) include(../submodules/CMake/ProjectOut.cmake)
include(../CMake/Version.cmake) include(../submodules/CMake/Version.cmake)
include(../CMake/QtUtils.cmake) include(../submodules/CMake/QtUtils.cmake)
include(../CMake/crossplatform/crossplatform.cmake) include(../submodules/CMake/crossplatform/crossplatform.cmake)
add_subdirectory(Library) add_subdirectory(Library)
add_subdirectory(Example) add_subdirectory(Example)

0
CMake → submodules/CMake
View File

3
tests/CMakeLists.txt
View File

@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.14)
set(CURRENT_PROJECT ${PROJECT_NAME}Test) set(CURRENT_PROJECT ${PROJECT_NAME}Test)
include(../CMake/ProjectOut.cmake) include(../submodules/CMake/ProjectOut.cmake)
file(GLOB SOURCE_CPP file(GLOB SOURCE_CPP
@ -26,6 +26,5 @@ target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test REN
target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR})
include(../CMake/QuasarAppCITargets.cmake)
initTests() initTests()
addTests(${PROJECT_NAME} ${CURRENT_PROJECT}) addTests(${PROJECT_NAME} ${CURRENT_PROJECT})