Author: pierre Date: Sat Apr 17 13:14:00 2021 New Revision: 4289 Log: Fix building evolution-data-server with cmake-3.20.1
Added: trunk/evolution-data-server/ trunk/evolution-data-server/evolution-data-server-3.40.0-cmake_fix-1.patch Added: trunk/evolution-data-server/evolution-data-server-3.40.0-cmake_fix-1.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/evolution-data-server/evolution-data-server-3.40.0-cmake_fix-1.patch Sat Apr 17 13:14:00 2021 (r4289) @@ -0,0 +1,80 @@ +Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr> +Date: 2020-10-16 +Initial Package Version: 3.40.0 +Upstream Status: Applied +Origin: Upstream +Description: Fix an error when building with cmke-3.20.1 +From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001 +From: Milan Crha <[email protected]> +Date: Wed, 14 Apr 2021 16:58:08 +0200 +Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison + +CMake 3.20.1 errors out with: + +CMake Error at cmake/modules/PrintableOptions.cmake:38 (message): + variable name cannot be empty + Call Stack (most recent call first): + CMakeLists.txt:152 (add_printable_variable) + +Change how the parameter value is compared, to fix it. +--- + cmake/modules/PrintableOptions.cmake | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake +index ba1c9d0b7..339f1da4b 100644 +--- a/cmake/modules/PrintableOptions.cmake ++++ b/cmake/modules/PrintableOptions.cmake +@@ -19,40 +19,40 @@ + # prints all the build options previously added with the above functions + + macro(add_printable_variable_bare _name) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "variable name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + list(APPEND _printable_options ${_name}) + endmacro() + + macro(add_printable_option _name _description _default_value) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "option name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + option(${_name} ${_description} ${_default_value}) + add_printable_variable_bare(${_name}) + endmacro() + + macro(add_printable_variable _name _description _default_value) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "variable name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + set(${_name} ${_default_value} CACHE STRING ${_description}) + add_printable_variable_bare(${_name}) + endmacro() + + macro(add_printable_variable_path _name _description _default_value) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "path variable name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + set(${_name} ${_default_value} CACHE PATH ${_description}) + add_printable_variable_bare(${_name}) + endmacro() + + macro(add_printable_variable_filepath _name _description _default_value) +- if(_name STREQUAL "") ++ if("${_name}" STREQUAL "") + message(FATAL_ERROR "filepath variable name cannot be empty") +- endif(_name STREQUAL "") ++ endif("${_name}" STREQUAL "") + set(${_name} ${_default_value} CACHE FILEPATH ${_description}) + add_printable_variable_bare(${_name}) + endmacro() + + -- http://lists.linuxfromscratch.org/listinfo/patches FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
