Git commit 7123ab4c135adafa33abccc13f84d2605828727d by Stephen Kelly.
Committed on 22/02/2012 at 16:51.
Pushed by skelly into branch 'frameworks'.

Finish removal of kcal dependency.

M +0 -3 CMakeLists.txt
M +1 -6 ktnef/CMakeLists.txt

http://commits.kde.org/kdepimlibs/7123ab4c135adafa33abccc13f84d2605828727d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8a497c..a8351d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,9 +256,6 @@ add_subdirectory(kpimidentities)
add_subdirectory(kalarmcal)
add_definitions(-DKDE_NO_WINDOWSYSTEM) # TODO: Remove
add_subdirectory(kontactinterface)
-# TODO: Remove
-add_definitions(-DKDEPIM_NO_KCAL)
-set(KDEPIM_NO_KCAL True)
add_subdirectory(ktnef)

# All done, let's display what we found...
diff --git a/ktnef/CMakeLists.txt b/ktnef/CMakeLists.txt
index 8e8b621..5bacf6b 100644
--- a/ktnef/CMakeLists.txt
+++ b/ktnef/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory( tests )
include_directories(
${CMAKE_SOURCE_DIR}/kabc
${CMAKE_BINARY_DIR}/kabc
- ${CMAKE_SOURCE_DIR}/kcal
)

set(ktnef_LIB_SRCS
@@ -27,11 +26,7 @@ set(ktnef_LIB_SRCS

kde4_add_library(ktnef ${LIBRARY_TYPE} ${ktnef_LIB_SRCS})

-if (KDEPIM_NO_KCAL)
- target_link_libraries(ktnef ${KDE4_KIO_LIBS} kabc kcalcore kcalutils)
-else()
- target_link_libraries(ktnef ${KDE4_KIO_LIBS} kabc kcal kcalcore kcalutils)
-endif()
+target_link_libraries(ktnef ${KDE4_KIO_LIBS} kabc kcalcore kcalutils)

set_target_properties(ktnef PROPERTIES VERSION ${GENERIC_LIB_VERSION}
SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS ktnef EXPORT kdepimlibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS})