summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2020-11-01 13:34:00 -0500
committerAllen Winter <allen.winter@kdab.com>2020-11-01 13:34:00 -0500
commit5efb02583917decadc3699f8d71f9c1d42efb230 (patch)
treec4bd47936c4de49727b661e8c6ffec01da2703e4
parent84564915950979d3fd66210b12c5c9aedc8314d4 (diff)
parent940ccc635cf9999f42c034c387479e85219a993e (diff)
downloadlibical-git-5efb02583917decadc3699f8d71f9c1d42efb230.tar.gz
Merge branch '3.0'
-rw-r--r--ReleaseNotes.txt1
-rw-r--r--src/libical/CMakeLists.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 61ddff4d..5f98714e 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -39,6 +39,7 @@ Version 3.0.9 (UNRELEASED):
* Accept VTIMEZONE with more than one X- property
* Fix cross-compile support in libical-glib
* Fix build with newer libicu
+ * Fix compiled-in path for the built-in timezone data
Version 3.0.8 (07 March 2020):
------------------------------
diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt
index f76012bb..5cb20909 100644
--- a/src/libical/CMakeLists.txt
+++ b/src/libical/CMakeLists.txt
@@ -17,7 +17,7 @@ if(ICU_FOUND)
include_directories(${ICU_INCLUDE_DIRS})
endif()
-set(PACKAGE_DATA_DIR "\\\"${CMAKE_INSTALL_PREFIX}/share/libical\\\"")
+set(PACKAGE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/libical")
add_definitions(-DPACKAGE_DATA_DIR="${PACKAGE_DATA_DIR}")
set(ICALSCRIPTS ${CMAKE_SOURCE_DIR}/scripts/)