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

Bug 775363 - Fails to build with minimum CMake version

Browse Source
This commit is contained in:
Milan Crha
2016-12-01 11:09:14 +01:00
parent 1f0d42ed5c
commit 90fa2f856f
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Evolution build script
cmake_minimum_required(VERSION 3.0)
cmake_policy(VERSION 3.0)
cmake_minimum_required(VERSION 3.1)
cmake_policy(VERSION 3.1)
project(evolution
VERSION 3.23.3
@ -433,7 +433,12 @@ endif(ENABLE_YTNEF)
add_printable_variable_path(WITH_BOGOFILTER "Enable spam filtering using Bogofilter (defaults to /usr/bin/bogofilter)" ON)
string(LENGTH "${CMAKE_BINARY_DIR}" bindirlen)
string(SUBSTRING "${WITH_BOGOFILTER}" 0 ${bindirlen} substr)
string(LENGTH "${WITH_BOGOFILTER}" maxlen)
if(maxlen LESS bindirlen)
set(substr "***")
else(maxlen LESS bindirlen)
string(SUBSTRING "${WITH_BOGOFILTER}" 0 ${bindirlen} substr)
endif(maxlen LESS bindirlen)
string(TOUPPER "${WITH_BOGOFILTER}" optupper)
set(BOGOFILTER_COMMAND "")
@ -456,6 +461,7 @@ if(WITH_BOGOFILTER)
endif(WITH_BOGOFILTER)
unset(bindirlen)
unset(maxlen)
unset(substr)
unset(optupper)
@ -467,7 +473,12 @@ add_printable_variable_path(WITH_SPAMASSASSIN "Enable spam filtering using SpamA
add_printable_variable_path(WITH_SA_LEARN "Full path command where sa-learn is located (defaults to /usr/bin/sa-learn)" ON)
string(LENGTH "${CMAKE_BINARY_DIR}" bindirlen)
string(SUBSTRING "${WITH_SPAMASSASSIN}" 0 ${bindirlen} substr)
string(LENGTH "${WITH_SPAMASSASSIN}" maxlen)
if(maxlen LESS bindirlen)
set(substr "***")
else(maxlen LESS bindirlen)
string(SUBSTRING "${WITH_SPAMASSASSIN}" 0 ${bindirlen} substr)
endif(maxlen LESS bindirlen)
string(TOUPPER "${WITH_SPAMASSASSIN}" optupper)
set(SPAMASSASSIN_COMMAND "")
@ -488,7 +499,12 @@ if(WITH_SPAMASSASSIN)
set(SPAMASSASSIN_COMMAND "/usr/bin/spamassassin")
endif(SPAMASSASSIN_COMMAND STREQUAL "")
string(SUBSTRING "${WITH_SA_LEARN}" 0 ${bindirlen} substr)
string(LENGTH "${WITH_SA_LEARN}" maxlen)
if(maxlen LESS bindirlen)
set(substr "***")
else(maxlen LESS bindirlen)
string(SUBSTRING "${WITH_SA_LEARN}" 0 ${bindirlen} substr)
endif(maxlen LESS bindirlen)
string(TOUPPER "${WITH_SA_LEARN}" optupper)
set(SA_LEARN_COMMAND "")
@ -510,6 +526,7 @@ if(WITH_SPAMASSASSIN)
endif(WITH_SPAMASSASSIN)
unset(bindirlen)
unset(maxlen)
unset(substr)
unset(optupper)

15
cmake/modules/FindLDAP.cmake
View File

@ -29,14 +29,24 @@ if((NOT WITH_OPENLDAP) AND (NOT WITH_SUNLDAP))
endif((NOT WITH_OPENLDAP) AND (NOT WITH_SUNLDAP))
string(LENGTH "${CMAKE_BINARY_DIR}" bindirlen)
string(SUBSTRING "${WITH_OPENLDAP}" 0 ${bindirlen} substr)
string(LENGTH "${WITH_OPENLDAP}" maxlen)
if(maxlen LESS bindirlen)
set(substr "***")
else(maxlen LESS bindirlen)
string(SUBSTRING "${WITH_OPENLDAP}" 0 ${bindirlen} substr)
endif(maxlen LESS bindirlen)
string(TOUPPER "${WITH_OPENLDAP}" optupper)
if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
set(WITH_OPENLDAP "/usr")
endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
string(SUBSTRING "${WITH_SUNLDAP}" 0 ${bindirlen} substr)
string(LENGTH "${WITH_SUNLDAP}" maxlen)
if(maxlen LESS bindirlen)
set(substr "***")
else(maxlen LESS bindirlen)
string(SUBSTRING "${WITH_SUNLDAP}" 0 ${bindirlen} substr)
endif(maxlen LESS bindirlen)
string(TOUPPER "${WITH_SUNLDAP}" optupper)
if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
@ -44,6 +54,7 @@ if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}")
endif(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
unset(bindirlen)
unset(maxlen)
unset(substr)
unset(optupper)