From 56d08e1ffd58046998c76c7464a7556dd26f8210 Mon Sep 17 00:00:00 2001 From: S David <2100425+s-daveb@users.noreply.github.com> Date: Thu, 16 May 2024 21:13:06 -0400 Subject: [PATCH] Replace CMake modules with those from a submodule repository --- .gitmodules | 3 +++ CMake | 1 + CMakeLists.txt | 12 +++--------- 3 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 .gitmodules create mode 160000 CMake diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f061495 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "CMake"] + path = CMake + url = https://gitea.beniquez.me/sdaveb/CmakeTools.git diff --git a/CMake b/CMake new file mode 160000 index 0000000..3bd6f64 --- /dev/null +++ b/CMake @@ -0,0 +1 @@ +Subproject commit 3bd6f644028c8a84b5e795aafa69def0cb2f27c0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 64124db..57cdc0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,23 +4,17 @@ cmake_minimum_required(VERSION 3.26) list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake) include(BuildProperties) - -prevent_in_source_build() -disable_deprecated_features() -# When this package is included as a subproject, there's no need to -# build and run the unit-tests. -disable_tests_if_subproject() -#git_setup_submodules() +include(BuildOptions) project(QJsonModel - VERSION 0.0.7 + VERSION 0.0.8 LANGUAGES C CXX # Save this for later: # HOMEPAGE_URL DESCRIPTION "QJsonModel is a json tree model class for Qt6/C++17 based on QAbstractItemModel. MIT License." ) -detect_linkers() +check_and_set_linker() include(CPM)