mirror of
https://github.com/QuasarApp/CMakeProject.git
synced 2025-04-29 07:04:36 +00:00
Merge pull request #7 from QuasarApp/applayNewSubmodulesRules
aplay new submodules rules
This commit is contained in:
commit
aa4082ab27
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
||||
[submodule "CMake"]
|
||||
path = CMake
|
||||
path = submodules/CMake
|
||||
url = https://github.com/QuasarApp/CMake.git
|
||||
|
@ -23,8 +23,8 @@ 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(CMake/ccache.cmake)
|
||||
include(CMake/QuasarAppCITargets.cmake)
|
||||
include(submodules/CMake/ccache.cmake)
|
||||
include(submodules/CMake/QuasarAppCITargets.cmake)
|
||||
|
||||
# Add sub directories
|
||||
add_subdirectory(src)
|
||||
|
@ -17,10 +17,10 @@ set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
|
||||
include(../CMake/ProjectOut.cmake)
|
||||
include(../CMake/Version.cmake)
|
||||
include(../CMake/QtUtils.cmake)
|
||||
include(../CMake/crossplatform/crossplatform.cmake)
|
||||
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)
|
||||
|
@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
set(CURRENT_PROJECT ${PROJECT_NAME}Test)
|
||||
|
||||
include(../CMake/ProjectOut.cmake)
|
||||
include(../submodules/CMake/ProjectOut.cmake)
|
||||
|
||||
|
||||
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})
|
||||
|
||||
|
||||
include(../CMake/QuasarAppCITargets.cmake)
|
||||
initTests()
|
||||
addTests(${PROJECT_NAME} ${CURRENT_PROJECT})
|
||||
|
Loading…
x
Reference in New Issue
Block a user