callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PrintableOptions.cmake: Correct variable name comparison

Browse Source 
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.
This commit is contained in:
Milan Crha
2021-04-14 16:58:08 +02:00
parent 2e3bf3a6a6
commit ed8f230fa2
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmake/modules/PrintableOptions.cmake
View File

@ -19,40 +19,40 @@
# prints all the build options previously added with the above functions # prints all the build options previously added with the above functions
macro(add_printable_variable_bare _name) macro(add_printable_variable_bare _name)
if(_name STREQUAL "") if("${_name}" STREQUAL "")
message(FATAL_ERROR "variable name cannot be empty") message(FATAL_ERROR "variable name cannot be empty")
endif(_name STREQUAL "") endif("${_name}" STREQUAL "")
list(APPEND _printable_options ${_name}) list(APPEND _printable_options ${_name})
endmacro() endmacro()
macro(add_printable_option _name _description _default_value) macro(add_printable_option _name _description _default_value)
if(_name STREQUAL "") if("${_name}" STREQUAL "")
message(FATAL_ERROR "option name cannot be empty") message(FATAL_ERROR "option name cannot be empty")
endif(_name STREQUAL "") endif("${_name}" STREQUAL "")
option(${_name} ${_description} ${_default_value}) option(${_name} ${_description} ${_default_value})
add_printable_variable_bare(${_name}) add_printable_variable_bare(${_name})
endmacro() endmacro()
macro(add_printable_variable _name _description _default_value) macro(add_printable_variable _name _description _default_value)
if(_name STREQUAL "") if("${_name}" STREQUAL "")
message(FATAL_ERROR "variable name cannot be empty") message(FATAL_ERROR "variable name cannot be empty")
endif(_name STREQUAL "") endif("${_name}" STREQUAL "")
set(${_name} ${_default_value} CACHE STRING ${_description}) set(${_name} ${_default_value} CACHE STRING ${_description})
add_printable_variable_bare(${_name}) add_printable_variable_bare(${_name})
endmacro() endmacro()
macro(add_printable_variable_path _name _description _default_value) macro(add_printable_variable_path _name _description _default_value)
if(_name STREQUAL "") if("${_name}" STREQUAL "")
message(FATAL_ERROR "path variable name cannot be empty") message(FATAL_ERROR "path variable name cannot be empty")
endif(_name STREQUAL "") endif("${_name}" STREQUAL "")
set(${_name} ${_default_value} CACHE PATH ${_description}) set(${_name} ${_default_value} CACHE PATH ${_description})
add_printable_variable_bare(${_name}) add_printable_variable_bare(${_name})
endmacro() endmacro()
macro(add_printable_variable_filepath _name _description _default_value) macro(add_printable_variable_filepath _name _description _default_value)
if(_name STREQUAL "") if("${_name}" STREQUAL "")
message(FATAL_ERROR "filepath variable name cannot be empty") message(FATAL_ERROR "filepath variable name cannot be empty")
endif(_name STREQUAL "") endif("${_name}" STREQUAL "")
set(${_name} ${_default_value} CACHE FILEPATH ${_description}) set(${_name} ${_default_value} CACHE FILEPATH ${_description})
add_printable_variable_bare(${_name}) add_printable_variable_bare(${_name})
endmacro() endmacro()