Dominique Leuenberger
8ae0cb982e
- Add c95a70bfeae25b.patch: Fix build with cmake 3.20.1. OBS-URL: https://build.opensuse.org/request/show/889500 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=393
76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001
|
|
From: Milan Crha <mcrha@redhat.com>
|
|
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()
|
|
--
|
|
GitLab
|
|
|