Rename kf5kalarmcal -> kf5alarmcalendar

CMakeLists.txt

@@ -20,7 +20,7 @@ set(KF5_VERSION "4.98.0")
 
 ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KALARMCAL
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kalarmcal_version.h"
-                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KAlarmCalConfigVersion.cmake"
+                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5AlarmCalendarConfigVersion.cmake"
                         SOVERSION 5
 )
 
@@ -42,22 +42,22 @@ endif()
 add_subdirectory(src)
 
 ########### CMake Config Files ###########
-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5KAlarmCal")
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5AlarmCalendar")
 
 ecm_configure_package_config_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/KF5KAlarmCalConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/KF5KAlarmCalConfig.cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/KF5AlarmCalendarConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/KF5AlarmCalendarConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/KF5KAlarmCalConfig.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/KF5KAlarmCalConfigVersion.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/KF5AlarmCalendarConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/KF5AlarmCalendarConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
-install(EXPORT KF5KAlarmCalTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5KAlarmCalTargets.cmake NAMESPACE KF5::)
+install(EXPORT KF5AlarmCalendarTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5AlarmCalendarTargets.cmake NAMESPACE KF5::)
 
 install(FILES
    ${CMAKE_CURRENT_BINARY_DIR}/kalarmcal_version.h

KF5KAlarmCalConfig.cmake.in → KF5AlarmCalendarConfig.cmake.in

@@ -6,4 +6,4 @@ find_dependency(KF5KIO "@KF5_VERSION@")
 find_dependency(KF5PimIdentities "@KF5_VERSION@")
 find_dependency(KF5Holidays "@KF5_VERSION@")
 
-include("${CMAKE_CURRENT_LIST_DIR}/KF5KAlarmCalTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/KF5AlarmCalendarTargets.cmake")

src/CMakeLists.txt

@@ -24,13 +24,13 @@ set(kalarmcal_LIB_SRCS ${kalarmcal_LIB_SRCS}
     )
 
 
-add_library(KF5KAlarmCal ${kalarmcal_LIB_SRCS})
+add_library(KF5AlarmCalendar ${kalarmcal_LIB_SRCS})
 
-generate_export_header(KF5KAlarmCal BASE_NAME kalarmcal)
+generate_export_header(KF5AlarmCalendar BASE_NAME kalarmcal)
 
-add_library(KF5::KAlarmCal ALIAS KF5KAlarmCal)
+add_library(KF5::AlarmCalendar ALIAS KF5AlarmCalendar)
 
-target_link_libraries(KF5KAlarmCal
+target_link_libraries(KF5AlarmCalendar
                       KF5::Holidays
                       KF5::PimIdentities
                       KF5::CoreAddons
@@ -38,29 +38,29 @@ target_link_libraries(KF5KAlarmCal
                       KF5::AkonadiCore
                       )
 
-set_target_properties(KF5KAlarmCal PROPERTIES
+set_target_properties(KF5AlarmCalendar PROPERTIES
       VERSION ${KALARMCAL_VERSION_STRING}
       SOVERSION ${KALARMCAL_SOVERSION}
-      EXPORT_NAME KAlarmCal
+      EXPORT_NAME AlarmCalendar
 )
 
 
-target_include_directories(KF5KAlarmCal INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KAlarmCal>")
-target_include_directories(KF5KAlarmCal PUBLIC "$<BUILD_INTERFACE:${KAlarmCal_SOURCE_DIR}/src;${KAlarmCal_BINARY_DIR}/src>")
+target_include_directories(KF5AlarmCalendar INTERFACE "$<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KAlarmCal>")
+target_include_directories(KF5AlarmCalendar PUBLIC "$<BUILD_INTERFACE:${KAlarmCal_SOURCE_DIR}/src;${KAlarmCal_BINARY_DIR}/src>")
 
 
-install(TARGETS KF5KAlarmCal EXPORT KF5KAlarmCalTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KF5AlarmCalendar EXPORT KF5AlarmCalendarTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 
 ecm_generate_headers(KAlarmCal_CamelCase_HEADERS
   HEADER_NAMES
-  AlarmText  
-  CollectionAttribute  
-  CompatibilityAttribute  
-  DateTime  
-  EventAttribute  
-  KAEvent  
-  KARecurrence  
+  AlarmText
+  CollectionAttribute
+  CompatibilityAttribute
+  DateTime
+  EventAttribute
+  KAEvent
+  KARecurrence
   Repetition
   REQUIRED_HEADERS KAlarmCal_HEADERS
   PREFIX KAlarmCal
@@ -68,18 +68,10 @@ ecm_generate_headers(KAlarmCal_CamelCase_HEADERS
 
 
 install(FILES
-        alarmtext.h
-        datetime.h
+        ${CMAKE_CURRENT_BINARY_DIR}/kalarmcal_export.h
         identities.h
         kacalendar.h
-        kaevent.h
-        ${CMAKE_CURRENT_BINARY_DIR}/kalarmcal_export.h
-        karecurrence.h
-        repetition.h
         version.h
-        collectionattribute.h
-        compatibilityattribute.h
-        eventattribute.h
         ${KAlarmCal_HEADERS}
     ${KAlarmCal_CamelCase_HEADERS}
     DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KAlarmCal