summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2013-10-05 15:19:29 (GMT)
committerChristian Mollekopf <chrigi_1@fastmail.fm>2013-10-05 15:19:29 (GMT)
commit54ca862077640863cba2664972000f6919d12122 (patch)
tree295506172df757c7d4b529ebd10a1cc8a3281831
parent7b05a4e74ce6291ac933d15125f138f18beb00a3 (diff)
downloadlibcalendaring-54ca862077640863cba2664972000f6919d12122.tar.gz
Adapt to changes in the 4.11 kdepimlibs branch.
-rw-r--r--kdepimlibs/kabc/CMakeLists.txt18
m---------kdepimlibs/kdepimlibs0
2 files changed, 3 insertions, 15 deletions
diff --git a/kdepimlibs/kabc/CMakeLists.txt b/kdepimlibs/kabc/CMakeLists.txt
index cb785f6..01cd555 100644
--- a/kdepimlibs/kabc/CMakeLists.txt
+++ b/kdepimlibs/kabc/CMakeLists.txt
@@ -30,25 +30,13 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts)
-add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/field.cpp ${CMAKE_CURRENT_BINARY_DIR}/addressee.h ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts
- COMMAND ${PERL_EXECUTABLE} ${LIBCALENDARING_KABC_PATH}/scripts/makeaddressee
- DEPENDS
- ${LIBCALENDARING_KABC_PATH}/scripts/makeaddressee
- ${LIBCALENDARING_KABC_PATH}/scripts/addressee.src.cpp
- ${LIBCALENDARING_KABC_PATH}/scripts/addressee.src.h
- ${LIBCALENDARING_KABC_PATH}/scripts/entrylist
- ${LIBCALENDARING_KABC_PATH}/scripts/field.src.cpp
- )
-
-
########### next target ###############
set(kabc_LIB_SRCS
${LIBCALENDARING_KABC_PATH}/address.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
- ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
- ${CMAKE_CURRENT_BINARY_DIR}/field.cpp
+ ${LIBCALENDARING_KABC_PATH}/addressee.cpp
+ ${LIBCALENDARING_KABC_PATH}/addressee.h
+ ${LIBCALENDARING_KABC_PATH}/field.cpp
${LIBCALENDARING_KABC_PATH}/contactgroup.cpp
${LIBCALENDARING_KABC_PATH}/contactgrouptool.cpp
${LIBCALENDARING_KABC_PATH}/errorhandler.cpp
diff --git a/kdepimlibs/kdepimlibs b/kdepimlibs/kdepimlibs
-Subproject 47ded77c6696e4927621a9f2eb6ea4204ade44b
+Subproject ed994d74da0e45d9dda9ea168a304eef6e4cd29