Commit | Line | Data |
---|---|---|
dbeb8667 FF |
1 | Avoid opportunistic linkage against libdb and libicu. |
2 | ||
3 | diff -u -r ../libical-3.0.1/CMakeLists.txt ./CMakeLists.txt | |
4 | --- ../libical-3.0.1/CMakeLists.txt 2017-11-19 14:32:53.000000000 +0000 | |
5 | +++ ./CMakeLists.txt 2017-12-08 23:54:59.745527096 +0000 | |
6 | @@ -154,47 +154,6 @@ | |
7 | set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS True) | |
8 | endif() | |
9 | ||
10 | -# libicu is highly recommended for RSCALE support | |
11 | -# libicu can be found at http://www.icu-project.org | |
12 | -# RSCALE info at http://tools.ietf.org/html/rfc7529 | |
13 | -find_package(ICU) | |
14 | -set_package_properties(ICU PROPERTIES | |
15 | - TYPE RECOMMENDED | |
16 | - PURPOSE "For RSCALE (RFC7529) support" | |
17 | -) | |
18 | -add_feature_info( | |
19 | - "RSCALE support (RFC7529)" | |
20 | - ICU_FOUND | |
21 | - "build in RSCALE support" | |
22 | -) | |
23 | -if(ICU_FOUND) | |
24 | - set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc | |
25 | - set(HAVE_LIBICU 1) | |
26 | - if(ICU_MAJOR_VERSION VERSION_GREATER 50) | |
27 | - set(HAVE_ICU_DANGI TRUE) | |
28 | - else() | |
29 | - set(HAVE_ICU_DANGI FALSE) | |
30 | - endif() | |
31 | -endif() | |
32 | -if(ICU_I18N_FOUND) | |
33 | - set(HAVE_LIBICU_I18N 1) | |
34 | -endif() | |
35 | - | |
36 | -# compile in Berkeley DB support | |
37 | -find_package(BDB) | |
38 | -set_package_properties(BDB PROPERTIES | |
39 | - TYPE OPTIONAL | |
40 | - PURPOSE "For Berkeley DB storage support" | |
41 | -) | |
42 | -add_feature_info( | |
43 | - "Berkeley DB storage support" | |
44 | - BDB_FOUND | |
45 | - "build in support for Berkeley DB storage" | |
46 | -) | |
47 | -if(BDB_FOUND) | |
48 | - set(HAVE_BDB True) | |
49 | -endif() | |
50 | - | |
51 | # MSVC specific definitions | |
52 | if(WIN32) | |
53 | if(MSVC) |