From 38d258f438fff99401d5be1c3f1dfb9a4fbd405d Mon Sep 17 00:00:00 2001 From: EndrII Date: Mon, 12 Apr 2021 16:24:31 +0300 Subject: [PATCH] aplay new submodules rules --- .gitmodules | 2 +- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 8 ++++---- CMake => submodules/CMake | 0 tests/CMakeLists.txt | 3 +-- 5 files changed, 8 insertions(+), 9 deletions(-) rename CMake => submodules/CMake (100%) diff --git a/.gitmodules b/.gitmodules index d892894..f305b28 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "CMake"] - path = CMake + path = submodules/CMake url = https://github.com/QuasarApp/CMake.git diff --git a/CMakeLists.txt b/CMakeLists.txt index e108f90..d15e33f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 523abaa..a12f361 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) diff --git a/CMake b/submodules/CMake similarity index 100% rename from CMake rename to submodules/CMake diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1da5556..bf110d8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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})