Modernize cmake. Add git version to build.

builders/Linux/iwyu.sh

@@ -4,11 +4,14 @@
 
 set -e
 
+CURRENT=${BASH_SOURCE%/*}
+source "$CURRENT/../versions"
+
 BUILD_TYPE=${BUILD_TYPE:-Debug}
-mkdir -p /mediafx/build/Linux/${BUILD_TYPE}
-cd /mediafx/build/Linux/${BUILD_TYPE}
-if [ ! -f "qt${QT_VER}.imp" ]; then
-    curl -O https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/clang_13/mapgen/iwyu-mapgen-qt.py
-    python3 iwyu-mapgen-qt.py ${QTDIR}/include > qt${QT_VER}.imp
+MEDIAFX_BUILD=${BUILD_ROOT}/${BUILD_TYPE}
+mkdir -p "${MEDIAFX_BUILD}"
+if [ ! -f "${MEDIAFX_BUILD}/qt${QT_VER}.imp" ]; then
+    curl -o "${MEDIAFX_BUILD}/iwyu-mapgen-qt.py" https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/clang_13/mapgen/iwyu-mapgen-qt.py
+    python3 "${MEDIAFX_BUILD}/iwyu-mapgen-qt.py" ${QTDIR}/include > "${MEDIAFX_BUILD}/qt${QT_VER}.imp"
 fi
-CC="clang" CXX="clang++" cmake -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="/usr/bin/iwyu;-Xiwyu;--mapping_file=/mediafx/build/Linux/${BUILD_TYPE}/qt${QT_VER}.imp;-Xiwyu;--mapping_file=/mediafx/builders/Linux/iwyu.imp;-Xiwyu;--cxx17ns;-Xiwyu;--no_comments" --install-prefix ${QTDIR} ../../.. && exec cmake --build . --parallel 4
+CC="clang" CXX="clang++" cmake -S "${SOURCE_ROOT}" -B "$MEDIAFX_BUILD" -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="/usr/bin/iwyu;-Xiwyu;--mapping_file=${MEDIAFX_BUILD}/qt${QT_VER}.imp;-Xiwyu;--mapping_file=/mediafx/builders/Linux/iwyu.imp;-Xiwyu;--cxx17ns;-Xiwyu;--no_comments" --install-prefix ${QTDIR} && exec cmake --build "${MEDIAFX_BUILD}" --parallel 4

builders/Linux/lint.sh

@@ -2,14 +2,18 @@
 # Copyright (C) 2024 Andrew Wason
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+CURRENT=${BASH_SOURCE%/*}
+source "$CURRENT/../versions"
+
 BUILD_TYPE=${BUILD_TYPE:-Debug}
-mkdir -p /mediafx/build/Linux/${BUILD_TYPE}
-cd /mediafx/build/Linux/${BUILD_TYPE}
-cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} --install-prefix ${QTDIR} ../../.. || exit 1
+MEDIAFX_BUILD=${BUILD_ROOT}/${BUILD_TYPE}
+mkdir -p "${MEDIAFX_BUILD}"
+cmake -S "${SOURCE_ROOT}" -B "$MEDIAFX_BUILD" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=${BUILD_TYPE} --install-prefix ${QTDIR} || exit 1
 # Generate *.moc include files for tests
-make tst_encoder_autogen/fast tst_decoder_autogen/fast tst_interval_autogen/fast || exit 1
+cmake --build "${MEDIAFX_BUILD}" --target tst_encoder_autogen/fast tst_decoder_autogen/fast tst_interval_autogen/fast || exit 1
+
 cd /mediafx
 git config --global --add safe.directory /mediafx
 FILES=$(git ls-files '**/*.cpp' '**/*.h')
-/usr/bin/clang-tidy -p /mediafx/build/Linux/${BUILD_TYPE} $FILES || exit 1
-/usr/bin/clazy-standalone -p /mediafx/build/Linux/${BUILD_TYPE}/compile_commands.json $FILES || exit 1
+/usr/bin/clang-tidy -p "${MEDIAFX_BUILD}" $FILES || exit 1
+/usr/bin/clazy-standalone -p "${MEDIAFX_BUILD}/compile_commands.json" $FILES || exit 1

builders/mediafx-build.sh

@@ -8,5 +8,4 @@ source "$CURRENT/versions"
 BUILD_TYPE=${BUILD_TYPE:-Release}
 MEDIAFX_BUILD="${BUILD_ROOT}/${BUILD_TYPE}"
 mkdir -p "$MEDIAFX_BUILD"
-cd "$MEDIAFX_BUILD"
-(cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE --install-prefix "${QTDIR}" ../../.. && cmake --build . && ${SUDO} cmake --install .) || exit 1
+(cmake -S "${SOURCE_ROOT}" -B "$MEDIAFX_BUILD" -DCMAKE_BUILD_TYPE=$BUILD_TYPE --install-prefix "${QTDIR}" && cmake --build "$MEDIAFX_BUILD" && ${SUDO} cmake --install "$MEDIAFX_BUILD") || exit 1

builders/mediafx-test.sh

@@ -6,5 +6,4 @@ CURRENT=${BASH_SOURCE%/*}
 source "$CURRENT/versions"
 
 BUILD_TYPE=${BUILD_TYPE:-Release}
-cd "${BUILD_ROOT}/${BUILD_TYPE}" || exit 1
-ctest --output-on-failure "${@}" || exit 1
+ctest --test-dir "${BUILD_ROOT}/${BUILD_TYPE}" --output-on-failure "${@}" || exit 1

builders/versions

@@ -1,4 +1,5 @@
 export QT_VER=6.6.2
+export SOURCE_ROOT="${BASH_SOURCE%/*}/.."
 BUILD_ROOT="${BASH_SOURCE%/*}/../build/$(uname)"
 mkdir -p "${BUILD_ROOT}"
 export BUILD_ROOT=$(cd "${BUILD_ROOT}"; pwd)

src/MediaFX/CMakeLists.txt

@@ -9,6 +9,19 @@ pkg_search_module(libavutil REQUIRED IMPORTED_TARGET libavutil>=56.70.100)
 
 option(EVENT_LOGGER "Enable event logger" OFF)
 
+find_package(Git QUIET)
+
+if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+    execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty --always
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        OUTPUT_VARIABLE MEDIAFX_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+else()
+    set(MEDIAFX_VERSION dev)
+endif()
+
+configure_file("version.h.in" "version.h")
+
 qt_add_library(mediafx STATIC
     application.cpp
     session.cpp
@@ -34,6 +47,9 @@ qt_add_executable(mediafxtool
     main.cpp
 )
 
+# For generated version.h
+target_include_directories(mediafxtool PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+
 if(EVENT_LOGGER)
     target_sources(mediafxtool PRIVATE event_logger.h)
     add_compile_definitions(EVENTLOGGER)

src/MediaFX/main.cpp

@@ -6,6 +6,7 @@
 #include "media_manager.h"
 #include "output_format.h"
 #include "session.h"
+#include "version.h"
 #include <QCommandLineOption>
 #include <QCommandLineParser>
 #include <QDebug>
@@ -47,7 +48,7 @@ int main(int argc, char* argv[])
     app.setApplicationName(u"MediaFX"_s);
 
     QCommandLineParser parser;
-    parser.setApplicationDescription(u"MediaFX\nCopyright (C) 2023-2024 Andrew Wason\nSPDX-License-Identifier: GPL-3.0-or-later"_s);
+    parser.setApplicationDescription(u"MediaFX\nCopyright (C) 2023-2024 Andrew Wason\nSPDX-License-Identifier: GPL-3.0-or-later\nVersion: %1"_s.arg(MediaFXVersion));
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
     parser.addHelpOption();
     parser.addOption({ { u"f"_s, u"fps"_s }, u"Output frames per second, can be integer or rational e.g. 30000/1001."_s, u"fps"_s, u"30"_s });

src/MediaFX/version.h.in

@@ -0,0 +1,6 @@
+// Copyright (C) 2024 Andrew Wason
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+inline constexpr auto MediaFXVersion = "@MEDIAFX_VERSION@";