From e8f0e7f879ddd43ac0f7b4a4c390e6de8614be7e Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Fri, 21 Feb 2020 09:15:23 +0100 Subject: [PATCH] move configure_file() invocation lower after the libraries were all found This fixes the issue that Linux builds were configured without PNG screenshot support, although the dl library has been found. Thanks @AlexMax for figuring this out. Also, this will eventually become Woof! 1.0. Thanks @JNechaevsky for performing a series of demo playback tests confirming the port's stability after the sound system overhaul. Interestingly, these checks wouldn't have been possible without vastly improving the port's Vanilla demo playback capabilities before. These were, in turn, hard to compare against the original WinMBF, because the latter would occasionally crash due to the fragile sound channel locking... I am really glad that this mess has been figured out now! --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 524b7512..8bc0798d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") # 3.12 is needed for modern FindPython. cmake_minimum_required(VERSION 3.12) project("Woof" - VERSION 0.9.0 + VERSION 1.0.0 DESCRIPTION "Woof! is a continuation of Lee Killough's Doom source port MBF targeted at modern systems." HOMEPAGE_URL "https://github.com/fabiangreffrath/woof" LANGUAGES C) @@ -22,9 +22,7 @@ set(PROJECT_COPYRIGHT "Copyright (C) 1993-2020") set(PROJECT_LICENSE "GNU General Public License, version 2") set(PROJECT_STRING "${PROJECT_NAME} ${PROJECT_VERSION}") set(PROJECT_TARNAME "woof") -set(PROJECT_VERSION_RC "0,9,0,0") - -configure_file(config.h.in config.h) +set(PROJECT_VERSION_RC "1,0,0,0") # Toggle-able defines added at compile-time. option("${PROJECT_NAME}_INSTRUMENTED" "Enable memory allocation statistics" OFF) @@ -40,6 +38,8 @@ find_package(SDL2_mixer) find_package(SDL2_net) find_package(Python3 COMPONENTS Interpreter) +configure_file(config.h.in config.h) + # Files that should be installed with the install target. configure_file(WoofInstall.cmake.in WoofInstall.cmake ESCAPE_QUOTES @ONLY) install(SCRIPT "${PROJECT_BINARY_DIR}/WoofInstall.cmake")