Reorder cmake targets and bump version

Author: patrickziegler

.github/workflows/build-and-test.yml

@@ -31,7 +31,7 @@ jobs:
         CXX: ${{matrix.config.CXX}}
         BUILD_DIR: "build/"
       run: |
-        cmake -B ${BUILD_DIR} -DENABLE_CLI=OFF -DENABLE_QT=OFF -DENABLE_TEST=ON
+        cmake -B ${BUILD_DIR} -DSKIP_CLI=ON -DSKIP_GUI=ON -DSKIP_KDE=ON -DENABLE_TEST=ON
         MAKEFLAGS=-j$(nproc) cmake --build ${BUILD_DIR}
         ctest --test-dir ${BUILD_DIR} -V
 
@@ -41,7 +41,7 @@ jobs:
         CXX: ${{matrix.config.CXX}}
         BUILD_DIR: "build-coverage/"
       run: |
-        cmake -B ${BUILD_DIR} -DENABLE_CLI=OFF -DENABLE_QT=OFF -DENABLE_TEST_COVERAGE=ON
+        cmake -B ${BUILD_DIR} -DSKIP_CLI=ON -DSKIP_GUI=ON -DSKIP_KDE=ON -DENABLE_TEST_COVERAGE=ON
         MAKEFLAGS=-j$(nproc) cmake --build ${BUILD_DIR}
         cmake --build ${BUILD_DIR} --target coverage
       if: matrix.config.CC == 'gcc'

CMakeLists.txt

@@ -1,12 +1,20 @@
 cmake_minimum_required(VERSION 3.12)
 
-project(MediaCopier VERSION 2.2.3)
+project(MediaCopier VERSION 2.3.0)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+option(SKIP_GUI "Don't build graphical user interface" OFF)
+option(SKIP_CLI "Don't build command line interface" OFF)
+option(SKIP_KDE "Don't build KDE Plasma integration" OFF)
+option(USE_QT5 "Build against Qt5 libraries (legacy)" OFF)
+option(ENABLE_TEST "Enable test targets" OFF)
+option(ENABLE_TEST_COVERAGE "Enable test and coverage targets" OFF)
+option(INSTALL_DEV_FILES "Install library headers and cmake targets" OFF)
+
 if(${MSVC})
     # range-v3 library needs permissive ruleset when compiled with MSVC
     # https://github.com/ericniebler/range-v3#supported-compilers
@@ -27,32 +35,24 @@ if(${MSVC})
     set(CLI_TARGET_FLAGS WIN32)
 endif()
 
-option(ENABLE_CLI "Build cli tool" ON)
-option(ENABLE_QT "Build Qt5 based graphical user interface" OFF)
-option(ENABLE_QT6 "Build Qt6 based graphical user interface" OFF)
-option(ENABLE_KDE "Enable KDE Plasma integration for graphical user interface" OFF)
-option(ENABLE_TEST "Enable test targets" OFF)
-option(ENABLE_TEST_COVERAGE "Enable test and coverage targets" OFF)
-option(INSTALL_DEV_FILES "Install library headers and cmake targets" OFF)
-
 set(MEDIACOPIER_CORE_LIB libmediacopier-core)
 set(MEDIACOPIER_UI_LIB libmediacopier-ui)
 
 add_subdirectory(lib/core)
 
-if(${ENABLE_CLI})
-    add_subdirectory(app/mediacopier-cli)
-endif()
-
-if(${ENABLE_QT} OR ${ENABLE_QT6} OR ${ENABLE_KDE})
+if(NOT ${SKIP_GUI} OR NOT ${SKIP_KDE})
     add_subdirectory(lib/ui)
 endif()
 
-if(${ENABLE_QT} OR ${ENABLE_QT6})
+if(NOT ${SKIP_GUI})
     add_subdirectory(app/mediacopier)
 endif()
 
-if(${ENABLE_KDE})
+if(NOT ${SKIP_CLI})
+    add_subdirectory(app/mediacopier-cli)
+endif()
+
+if(NOT ${SKIP_KDE})
     add_subdirectory(app/mediacopier-plasma)
 endif()
 

README.md

@@ -103,13 +103,13 @@ podman run -it --rm -v ${PWD}:/usr/src/mediacopier mediacopier-build
 Inside the container, run the test suite with the following commands
 
 ```sh
-cmake -DUSE_QT5=ON -DSKIP_GUI=ON -DENABLE_TEST=ON /usr/src/mediacopier/ && make -j $(nproc) && make test
+cmake -DUSE_QT5=ON -DSKIP_GUI=ON -DSKIP_KDE=ON -DENABLE_TEST=ON /usr/src/mediacopier/ && make -j $(nproc) && make test
 ```
 
 Alternatively, create a test coverage report like this (result can also be found [here](https://coveralls.io/github/patrickziegler/MediaCopier))
 
 ```sh
-cmake -DUSE_QT5=ON -DSKIP_GUI=ON -DENABLE_TEST_COVERAGE=ON /usr/src/mediacopier/ && make -j $(nproc) && make coverage
+cmake -DUSE_QT5=ON -DSKIP_GUI=ON -DSKIP_KDE=ON -DENABLE_TEST_COVERAGE=ON /usr/src/mediacopier/ && make -j $(nproc) && make coverage
 ```
 
 ### :paperclip: Build Instructions for Windows
@@ -123,7 +123,7 @@ Prepare the [vcpkg](https://github.com/microsoft/vcpkg#using-vcpkg-with-cmake) e
 
 Use the vcpkg toolchain file with cmake
 ```sh
-cmake -DCMAKE_TOOLCHAIN_FILE=${VCPKG_DIR}\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -B build -S .
+cmake -DCMAKE_TOOLCHAIN_FILE=${VCPKG_DIR}\vcpkg\scripts\buildsystems\vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DSKIP_KDE=ON -B build -S .
 cmake --build build --config Release
 ```
 

app/mediacopier-plasma/CMakeLists.txt

@@ -1,15 +1,15 @@
 set(KF_LIBS)
 
-if(ENABLE_QT6)
-    find_package(KF6I18n REQUIRED)
-    find_package(KF6JobWidgets REQUIRED)
-    list(APPEND KF_LIBS KF6::I18n KF6::JobWidgets)
-    set(KF_VERSION ${KF6I18n_VERSION})
-else()
+if(${USE_QT5})
     find_package(KF5I18n REQUIRED)
     find_package(KF5JobWidgets REQUIRED)
     list(APPEND KF_LIBS KF5::I18n KF5::JobWidgets)
     set(KF_VERSION ${KF5I18n_VERSION})
+else()
+    find_package(KF6I18n REQUIRED)
+    find_package(KF6JobWidgets REQUIRED)
+    list(APPEND KF_LIBS KF6::I18n KF6::JobWidgets)
+    set(KF_VERSION ${KF6I18n_VERSION})
 endif()
 
 set(TARGET_NAME mediacopier-plasma)

app/mediacopier-plasma/source/main.cpp

@@ -21,8 +21,10 @@
 
 #include <KJob>
 #include <KUiServerV2JobTracker>
+
 #include <QApplication>
 #include <QTranslator>
+
 #include <spdlog/spdlog.h>
 
 class KMediaCopierJob : public KJob {

lib/core/CMakeLists.txt

@@ -126,8 +126,6 @@ if(${INSTALL_DEV_FILES})
         FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
             "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
         DESTINATION "${TARGETS_INSTALL_DIR}")
-
-elseif(${ENABLE_SHARED_LIB})
-    install(TARGETS ${TARGET_NAME})
-
 endif()
+
+install(TARGETS ${TARGET_NAME})

lib/ui/CMakeLists.txt

@@ -1,11 +1,11 @@
 set(QT_LIBS)
 
-if(ENABLE_QT6)
-    find_package(Qt6 REQUIRED COMPONENTS Core Widgets StateMachine LinguistTools)
-    list(APPEND QT_LIBS Qt6::Core Qt6::Widgets Qt6::StateMachine)
-else()
+if(${USE_QT5})
     find_package(Qt5 REQUIRED COMPONENTS Core Widgets LinguistTools)
     list(APPEND QT_LIBS Qt5::Core Qt5::Widgets)
+else()
+    find_package(Qt6 REQUIRED COMPONENTS Core Widgets StateMachine LinguistTools)
+    list(APPEND QT_LIBS Qt6::Core Qt6::Widgets Qt6::StateMachine)
 endif()
 
 find_package(spdlog 1.9.2 REQUIRED) # qt_sink_* available since v1.9.2