From cb96256185361859b28001303363d6fabe7d02f0 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Wed, 9 Oct 2024 13:22:08 -0700 Subject: [PATCH] Use FetchContent to get qtextpad rather than keeping it in a submodule. --- CMakeLists.txt | 11 ++++++++--- qtextpad | 1 - 2 files changed, 8 insertions(+), 4 deletions(-) delete mode 160000 qtextpad diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d9de03..8e03114 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.7) +cmake_minimum_required(VERSION 3.14) project(PlasmaShop) set(CMAKE_CXX_STANDARD 14) @@ -74,8 +74,13 @@ endif() add_definitions(-DPLASMASHOP_VERSION="${PlasmaShop_VERSION}") set(QTEXTPAD_WIDGET_ONLY ON) -add_subdirectory(qtextpad) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/qtextpad/lib") +include(FetchContent) +FetchContent_Declare(qtextpad + GIT_REPOSITORY https://github.com/zrax/qtextpad.git + GIT_TAG 1.11 +) +FetchContent_MakeAvailable(qtextpad) +include_directories("${qtextpad_SOURCE_DIR}/lib") add_subdirectory(src) diff --git a/qtextpad b/qtextpad deleted file mode 160000 index c8e2827..0000000 --- a/qtextpad +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c8e2827f9f424c1830c98ffcb340ff15f016cbc5