Add override to change `-MD` to `-MMD`

auto-makepkg/CMakeLists.txt

@@ -1,4 +1,13 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+
+if (CMAKE_GENERATOR MATCHES "Ninja")
+    file(
+        WRITE "${CMAKE_BINARY_DIR}/GNUMakeRulesOverwrite.cmake"
+            "STRING(REPLACE \"-MD\" \"-MMD\" CMAKE_DEPFILE_FLAGS_C \"\${CMAKE_DEPFILE_FLAGS_C}\")\n"
+            "STRING(REPLACE \"-MD\" \"-MMD\" CMAKE_DEPFILE_FLAGS_CXX \"\${CMAKE_DEPFILE_FLAGS_CXX}\")\n"
+    )
+    set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_BINARY_DIR}/GNUMakeRulesOverwrite.cmake" CACHE INTERNAL "")
+endif ()
 
 project("auto-makepkg-subdirs")
 set(SUBDIRS_PREFIX "../..")
@@ -13,16 +22,10 @@ if (EXISTS "${RAPIDJSON_INCLUDE_DIRS}")
 endif ()
 
 add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities)
-set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities")
 list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)
 link_directories(${CPP_UTILITIES_BINARY_DIR})
 
-add_subdirectory(${SUBDIRS_PREFIX}/passwordfile passwordfile)
-set(passwordfile${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/passwordfile")
-link_directories(${PASSWORD_FILE_BINARY_DIR})
-
 add_subdirectory(${SUBDIRS_PREFIX}/reflective-rapidjson reflective-rapidjson)
-set(reflective_rapidjson${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/reflective-rapidjson/lib")
 list(APPEND CMAKE_MODULE_PATH ${REFLECTIVE_RAPIDJSON_SOURCE_DIR}/cmake/modules)
 link_directories(${REFLECTIVE_RAPIDJSON_BINARY_DIR})
 

auto-makepkg/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

bookmarksync/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("bookmark-sync-subdirs")
 set(SUBDIRS_PREFIX "../..")

bookmarksync/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

dbus-soundrecorder/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("dbus-soundrecorder-subdirs")
 set(SUBDIRS_PREFIX "../..")

dbus-soundrecorder/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

geocoordinatecalculator/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("geocoordinatecalculator-subdirs")
 set(SUBDIRS_PREFIX "../..")

geocoordinatecalculator/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

passwordmanager/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("passwordmanager-subdirs")
 set(SUBDIRS_PREFIX "../..")
@@ -7,29 +7,32 @@ enable_testing()
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
 
 add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities)
-set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities")
 list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)
 link_directories(${CPP_UTILITIES_BINARY_DIR})
 
-if (QT_PACKAGE_PREFIX STREQUAL "Qt6")
-    # set variables to build KF against Qt 6 as well
-    set(BUILD_WITH_QT6 ON)
-    set(EXCLUDE_DEPRECATED_BEFORE_AND_AT CURRENT)
-    set(QT_MAJOR_VERSION "6")
-endif ()
-
 option(WIDGETS_GUI "enables/disables building the Qt Widgets GUI: yes (default) or no" ON)
 option(QUICK_GUI "enables/disables building the Qt Quick GUI: yes (default) or no" ON)
 if(WIDGETS_GUI OR QUICK_GUI)
     add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities)
-    set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities")
     list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules)
     link_directories(${QT_UTILITIES_BINARY_DIR})
 endif()
 if(QUICK_GUI)
-    # note: Building ECM as part of the project doesn't work. Simply build ECM sparately like
-    # "cmake -G Ninja -DBUILD_WITH_QT6=ON -DCMAKE_INSTALL_PREFIX=/home/martchus/build/qtcreator2/build-passwordmanager-Desktop-Debug/install /home/martchus/more_projects/kde/extra-cmake-modules"
-    # and set that install dir as ECM_DIR=/home/martchus/build/qtcreator2/build-passwordmanager-Desktop-Debug/install/share/ECM/cmake.
+    set(ECM_PATH OFF CACHE PATH "specifies the (relative) path to the extra-cmake-modules sources for building it together with passwordmanager")
+    if(NOT ECM_PATH)
+        message(STATUS "Using system extra-cmake-modules (ECM_PATH not set)")
+    else()
+        # FIXME: building ecm in the same project doesn't seem to work since it has references to the installed location
+        add_subdirectory("${ECM_PATH}" ecm)
+        #file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bundled-ecm")
+        #file(WRITE "${CMAKE_BINARY_DIR}/bundled-ecm/ECMConfig.cmake" "set(ECM_MODULE_DIR ${ECM_PATH}/modules)")
+        set(ECM_DIR "${CMAKE_BINARY_DIR}/bundled-ecm")
+        list(APPEND CMAKE_MODULE_PATH
+            "${ECM_PATH}/modules"
+            "${ECM_PATH}/kde-modules"
+            "${ECM_PATH}/find-modules"
+        )
+    endif()
 
     set(KIRIGAMI_PATH OFF CACHE PATH "specifies the (relative) path to the Kirigami 2 sources for building it together with passwordmanager")
     if(NOT KIRIGAMI_PATH)
@@ -41,7 +44,6 @@ if(QUICK_GUI)
 endif()
 
 add_subdirectory(${SUBDIRS_PREFIX}/passwordfile passwordfile)
-set(passwordfile${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/passwordfile")
 link_directories(${PASSWORD_FILE_BINARY_DIR})
 
 add_subdirectory(${SUBDIRS_PREFIX}/passwordmanager passwordmanager)

passwordmanager/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

pianobooster/CMakeLists.txt

@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
-
-project("pianobooster-subdirs")
-set(SUBDIRS_PREFIX "../..")
-enable_testing()
-
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
-
-message(STATUS "Adding c++utilities subdir")
-add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities)
-set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities")
-list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)
-link_directories(${CPP_UTILITIES_BINARY_DIR})
-
-message(STATUS "Adding qtutilities subdir")
-add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities)
-set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities")
-list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules)
-link_directories(${QT_UTILITIES_BINARY_DIR})
-
-message(STATUS "Adding pianobooster subdir")
-add_subdirectory(${SUBDIRS_PREFIX}/PianoBooster PianoBooster)

pianobooster/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

repoindex/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("repoindex-subdirs")
 set(SUBDIRS_PREFIX "../..")

repoindex/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

sync-all.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-set -e
-
-subdirs_path=$(dirname -- "$(realpath -- "$0")")
-cd "$subdirs_path"
-
-declare -A repo_names=(
-    [c++utilities]=cpp-utilities
-    [qtutilities]=
-    [qtforkawesome]=
-    [syncthingtray]=
-    [tagparser]=
-    [tageditor]=
-    [passwordfile]=
-    [passwordmanager]=
-    [videodownloader]=
-    [reflective-rapidjson]=
-    [dbus-soundrecorder]=
-    [geocoordinatecalculator]=
-    [auto-makepkg]=arch-repo-manager
-    [PianoBooster]=
-    [subdirs]=
-)
-
-# ensure a clone of all repositories exists
-for dir in "${!repo_names[@]}"; do
-    [[ -d ../$dir/.git ]] && continue
-    echo "==> Cloning $dir"
-    repo=${repo_names[$dir]:-$dir}
-    git -C .. clone -c core.symlinks=true "git@github.com:Martchus/$repo.git" "$dir"
-done
-
-# ensure the fallback repo is added
-for dir in "${!repo_names[@]}"; do
-    repo=${repo_names[$dir]:-$dir}
-    if ! git -C "../$dir" remote show gitea &> /dev/null ; then
-        echo "==> Adding fallback remote for $dir"
-        git -C "../$dir" remote add gitea "gitea@martchus.no-ip.biz:Martchus/$repo.git"
-    fi
-    if ! git -C "../$dir" remote show all &> /dev/null ; then
-        echo "==> Configuring 'all' remote for $dir"
-        git -C "../$dir" remote add all "git@github.com:Martchus/$repo.git"
-        git -C "../$dir" remote set-url --add --push all "git@github.com:Martchus/$repo.git"
-        git -C "../$dir" remote set-url --add --push all "gitea@martchus.no-ip.biz:Martchus/$repo.git"
-    fi
-done
-
-# ensure all repositories are up-to-date
-for dir in ../* ; do
-    [[ -d $dir/.git ]] || continue
-    echo "==> Updating $dir"
-    git -C "$dir" remote update
-    branch_name=$(git -C "$dir" symbolic-ref -q HEAD)
-    branch_name=${branch_name##refs/heads/}
-    branch_name=${branch_name:-DETACHED}
-
-    # try pushing local changes first
-    if git -C "$dir" push -u all master:master ; then
-        git -C "$dir" remote update
-    fi
-
-    if output=$(git -C "$dir" status --porcelain) && [[ -z $output ]] && [[ $branch_name == DETACHED || $branch_name == master ]]; then
-        git -C "$dir" reset --hard origin/master
-    fi
-done
-

syncthingtray/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("syncthingtray-subdirs")
 set(SUBDIRS_PREFIX "../..")
@@ -6,18 +6,12 @@ enable_testing()
 
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
 
-message(STATUS "Adding c++utilities subdir")
 add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities)
-set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities")
 list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)
 link_directories(${CPP_UTILITIES_BINARY_DIR})
 
-message(STATUS "Adding qtutilities subdir")
 add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities)
-set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities")
 list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules)
 link_directories(${QT_UTILITIES_BINARY_DIR})
 
-message(STATUS "Adding syncthingtray subdir")
-set(BUNDLED_QT_FORK_AWESOME_PATH "../qtforkawesome" CACHE PATH "specifies the (relative) path to the qtforkawesome sources for building it together with ${META_PROJECT_NAME}")
 add_subdirectory(${SUBDIRS_PREFIX}/syncthingtray syncthingtray)

syncthingtray/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

tageditor/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("tageditor-subdirs")
 set(SUBDIRS_PREFIX "../..")
@@ -7,7 +7,6 @@ enable_testing()
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
 
 add_subdirectory(${SUBDIRS_PREFIX}/c++utilities c++utilities)
-set(c++utilities${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/c++utilities")
 list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_SOURCE_DIR}/cmake/modules)
 link_directories(${CPP_UTILITIES_BINARY_DIR})
 
@@ -15,7 +14,6 @@ option(WIDGETS_GUI "enables/disables building the Qt Widgets GUI: yes (default)
 option(QUICK_GUI "enables/disables building the Qt Quick GUI: yes (default) or no" ON)
 if(WIDGETS_GUI OR QUICK_GUI)
     add_subdirectory(${SUBDIRS_PREFIX}/qtutilities qtutilities)
-    set(qtutilities${CONFIGURATION_PACKAGE_SUFFIX_QTUTILITIES}_DIR "${CMAKE_CURRENT_BINARY_DIR}/qtutilities")
     list(APPEND CMAKE_MODULE_PATH ${QT_UTILITIES_SOURCE_DIR}/cmake/modules)
     link_directories(${QT_UTILITIES_BINARY_DIR})
 endif()
@@ -23,13 +21,11 @@ endif()
 option(ENABLE_JSON_EXPORT "enable JSON export" OFF)
 if(ENABLE_JSON_EXPORT)
     add_subdirectory(${SUBDIRS_PREFIX}/reflective-rapidjson reflective-rapidjson)
-    set(reflective_rapidjson${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/reflective-rapidjson/lib")
     list(APPEND CMAKE_MODULE_PATH ${REFLECTIVE_RAPIDJSON_SOURCE_DIR}/cmake/modules)
     link_directories(${REFLECTIVE_RAPIDJSON_BINARY_DIR})
 endif()
 
 add_subdirectory(${SUBDIRS_PREFIX}/tagparser tagparser)
-set(tagparser${CONFIGURATION_PACKAGE_SUFFIX}_DIR "${CMAKE_CURRENT_BINARY_DIR}/tagparser")
 link_directories(${TAG_PARSER_BINARY_DIR})
 
 add_subdirectory(${SUBDIRS_PREFIX}/tageditor tageditor)

tageditor/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json

videodownloader/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.17.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
 project("videodownloader-subdirs")
 set(SUBDIRS_PREFIX "../..")

videodownloader/CMakePresets.json

@@ -1 +0,0 @@
-../../c++utilities/CMakePresets.json