[evolution-etesync] PrintableOptions.cmake: Correct variable name comparison



commit c75e4e0d2baef67dea73ef1e01fd860692e4c70e
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 14 17:10:38 2021 +0200

    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. (Basically sync
    with the content used by the evolution core projects.)

 cmake/modules/PrintableOptions.cmake | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
index a79419a..339f1da 100644
--- a/cmake/modules/PrintableOptions.cmake
+++ b/cmake/modules/PrintableOptions.cmake
@@ -19,36 +19,44 @@
 #    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 "")
+               message(FATAL_ERROR "filepath variable name cannot be empty")
+       endif("${_name}" STREQUAL "")
+       set(${_name} ${_default_value} CACHE FILEPATH ${_description})
+       add_printable_variable_bare(${_name})
+endmacro()
+
 function(print_build_options)
        message(STATUS "Configure options:")
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]