summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Minichmayr <markus@tapkey.com>2022-03-06 22:29:29 +0100
committerAllen Winter <allen.winter@kdab.com>2022-06-03 11:17:08 -0400
commit19ca5336c707bb70b3c62805c04fe04e35941d68 (patch)
tree7b01c9a32f059a87efc0e6d71d3bb20c78689b6f
parent12fc125c334ad9029be5a72eb4ec5dac6276ba10 (diff)
downloadlibical-git-19ca5336c707bb70b3c62805c04fe04e35941d68.tar.gz
Migrate icaltime.h to icaltime.h.cmake to allow deeper integration with cmake.
-rw-r--r--src/libical/CMakeLists.txt7
-rw-r--r--src/libical/ical_file.cmake2
-rw-r--r--src/libical/icaltime.h.cmake (renamed from src/libical/icaltime.h)0
3 files changed, 7 insertions, 2 deletions
diff --git a/src/libical/CMakeLists.txt b/src/libical/CMakeLists.txt
index aa4311ad..8f14071c 100644
--- a/src/libical/CMakeLists.txt
+++ b/src/libical/CMakeLists.txt
@@ -6,6 +6,11 @@ configure_file(
@ONLY
)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/icaltime.h.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/icaltime.h
+)
+
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
@@ -405,7 +410,7 @@ install(FILES
icalproperty.h
icalrecur.h
icalrestriction.h
- icaltime.h
+ ${CMAKE_BINARY_DIR}/src/libical/icaltime.h
icaltz-util.h
icaltimezone.h
icaltypes.h
diff --git a/src/libical/ical_file.cmake b/src/libical/ical_file.cmake
index 8a13d07c..6ea99deb 100644
--- a/src/libical/ical_file.cmake
+++ b/src/libical/ical_file.cmake
@@ -3,7 +3,7 @@
set(COMBINEDHEADERSICAL
${TOPB}/config_public.h
${TOPB}/src/libical/icalversion.h
- ${TOPS}/src/libical/icaltime.h
+ ${TOPB}/src/libical/icaltime.h
${TOPS}/src/libical/icalduration.h
${TOPS}/src/libical/icalperiod.h
${TOPS}/src/libical/icalenums.h
diff --git a/src/libical/icaltime.h b/src/libical/icaltime.h.cmake
index c663ba2e..c663ba2e 100644
--- a/src/libical/icaltime.h
+++ b/src/libical/icaltime.h.cmake