freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

databases/evolution-data-server: fix build for CMake 3.20

Browse Source 
This is basically upstream commit
	c95a70bfeae25ba11fbe50fe759a6cdb29388e44
but re-done independently by me because I fixed first and
then looked in source control.
This commit is contained in:
Adriaan de Groot
2021-04-22 22:05:11 +02:00
parent e75ad72a3c
commit 77112137ef
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
databases/evolution-data-server/Makefile
View File

@@ -2,6 +2,7 @@
PORTNAME= evolution-data-server
DISTVERSION= 3.40.0
PORTREVISION= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome

53
databases/evolution-data-server/files/patch-cmake_modules_PrintableOptions.cmake Normal file
View File

@@ -0,0 +1,53 @@
--- cmake/modules/PrintableOptions.cmake.orig 2021-04-22 19:58:13 UTC
+++ 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()
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()
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()
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()
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()
set(${_name} ${_default_value} CACHE FILEPATH ${_description})
add_printable_variable_bare(${_name})
endmacro()