From 47fb9653b86986a76d9a5dd67955ffd598755e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Fri, 22 Oct 2021 15:04:24 +0200 Subject: Bump the CMake version requirement, fix Windows - Add a missing runtime library for gettext-tools. - Remove the no longer necessary customized FindGettext.cmake, since the downloaded gettext binaries are new enough. - Make the installer at least ask to uninstall previous versions. - Adjust the PATH of tests so that they'll run on Windows directly. - Fix quoting so that the project will build inside paths with spaces. - Resolve a GSettings deprecation warning. - Update the README's build instructions as appropriate. - Require CMake 3.9 because of the README's suggestion to fix FindPkgConfig.cmake manually using separate_arguments(UNIX_COMMAND). Tested build configurations: - native Arch Linux, - native Windows XP with the newest NSIS, - Arch Linux Mingw-w64 i686 Win32Depends.cmake NSIS cross-build + XP, - Arch Linux Mingw-w64 x86_64 MSYS2 NSIS cross-build + Windows 10. Detected issues: - The file save dialog will not add the extension automatically, seen with MSYS2. --- README.adoc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'README.adoc') diff --git a/README.adoc b/README.adoc index fbd7109..ab899d8 100644 --- a/README.adoc +++ b/README.adoc @@ -15,7 +15,7 @@ a package with the latest development version from Archlinux's AUR. Requirements ------------ Runtime dependencies: GTK+ >= 3.8, json-glib >= 0.10.4, lua >= 5.2 + -Build dependencies: CMake >= 2.8.12 +Build dependencies: CMake >= 3.9 Build from source on Unix-like systems -------------------------------------- @@ -53,8 +53,11 @@ Build from source on Windows ---------------------------- _Note that with the current method we're stuck with GTK+ 3.8.2._ -First install CMake >= 3.1 and MinGW. Add both to your system path. If you want -to build an installation package, also install NSIS. +First install CMake and MinGW. Add both to your system path. If you want +to build an installation package, also install NSIS. If you want to build within +a path containing spaces, fix your FindPkgConfig.cmake to say: + + separate_arguments(_pkgconfig_invoke_result UNIX_COMMAND "${_pkgconfig_invoke_result}") Run the following command in the directory with source files to automatically fetch and setup all dependencies (contact me if the script becomes obsolete, @@ -63,6 +66,8 @@ releasing a new version in order to resolve compatibility issues): > cmake -P Win32Depends.cmake +Note that Windows XP is no longer able to reliably download from HTTPS sources. + Reserve a directory for an out-of-source build: > mkdir build -- cgit v1.2.3