diff options
| author | Milan Crha <mcrha@redhat.com> | 2021-04-14 16:58:08 +0200 |
|---|---|---|
| committer | Jordan Petridis <jpetridis@gnome.org> | 2021-06-09 19:08:10 +0000 |
| commit | 03e197d88650a73cc3ca02cee3bd0e6d272023ed (patch) | |
| tree | 43652ab35f19a683b8d46db856d8fbbef4c3cd79 | |
| parent | f66e7f7a68cc63e737ccb2011cdce047c61cf116 (diff) | |
| download | evolution-data-server-cherry-pick-c95a70bf.tar.gz | |
PrintableOptions.cmake: Correct variable name comparisoncherry-pick-c95a70bf
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.
(cherry picked from commit c95a70bfeae25ba11fbe50fe759a6cdb29388e44)
| -rw-r--r-- | cmake/modules/PrintableOptions.cmake | 20 |
1 files 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() |