summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-10-17 16:10:38 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-10-17 16:10:38 (GMT)
commit17601c16ef211e3de6d9751bef85cccfae38e8fb (patch)
tree87b922f8cb19724f0233f63b567cab57e5c50f8e
parent5c31e4a8a9f40aa50810ab3169247734b8acd5d1 (diff)
downloadkolab-utils-17601c16ef211e3de6d9751bef85cccfae38e8fb.tar.gz
Separate cmake files of different utilities.
-rw-r--r--CMakeLists.txt46
-rw-r--r--fbdaemon/CMakeLists.txt23
2 files changed, 24 insertions, 45 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93f65e4..96f8754 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,8 +49,9 @@ add_subdirectory(lib)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_subdirectory(upgradetool)
add_subdirectory(fbdaemon)
+add_subdirectory(migrationutility)
+add_subdirectory(upgradetool)
########## Upgradetool
@@ -67,46 +68,3 @@ install(TARGETS kolab-formatupgrade
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
-
-########## Freebusy
-
-QT4_WRAP_CPP(FB_MOC
- fbdaemon/authenticationjob.h
- fbdaemon/fbcoordinator.h
- fbdaemon/fbgeneratorjob.h
- fbdaemon/generatefbjob.h
- fbdaemon/kolabjob.h
- fbdaemon/fbaggregatorjob.h
-)
-set( FBDAEMON_SRCS ${FBDAEMON_SRCS} ${FB_MOC} ${JOBS_SRCS} )
-
-add_executable(kolab-freebusyd ${FBDAEMON_SRCS} ${JOB_SRCS})
-target_link_libraries(kolab-freebusyd ${COMMON_DEPENDENCIES} kolabutils)
-
-install(TARGETS kolab-freebusyd
- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-)
-########## Migration-Utility
-add_subdirectory(migrationutility)
-
-# QT4_WRAP_CPP(MIGRATION_MOC
-# migrationutility/coordinationjob.h
-# migrationutility/migrateuserjob.h
-# migrationutility/sourceaccount.h
-# migrationutility/sourceserver.h
-# )
-#
-# add_executable(kolab-migration ${MIGRATION_SRCS} ${MIGRATION_MOC} ${JOBS_SRCS})
-# target_link_libraries(kolab-migration ${COMMON_DEPENDENCIES})
-#
-# install(TARGETS kolab-migration
-# RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-# LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-# ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-# )
-
-########## tests
-
-#add_subdirectory(tests)
diff --git a/fbdaemon/CMakeLists.txt b/fbdaemon/CMakeLists.txt
index df5c2fa..7f95c9a 100644
--- a/fbdaemon/CMakeLists.txt
+++ b/fbdaemon/CMakeLists.txt
@@ -7,4 +7,25 @@ set (FBDAEMON_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/settings.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kolabjob.cpp
${CMAKE_CURRENT_SOURCE_DIR}/fbaggregatorjob.cpp
- PARENT_SCOPE)
+)
+
+QT4_WRAP_CPP(FB_MOC
+ ${CMAKE_CURRENT_SOURCE_DIR}/authenticationjob.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/fbcoordinator.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/fbgeneratorjob.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/generatefbjob.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/kolabjob.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/fbaggregatorjob.h
+)
+set( FBDAEMON_SRCS ${FBDAEMON_SRCS} ${FB_MOC} ${JOBS_SRCS} )
+
+add_executable(kolab-freebusyd ${FBDAEMON_SRCS} ${JOB_SRCS})
+target_link_libraries(kolab-freebusyd ${COMMON_DEPENDENCIES} kolabutils)
+
+install(TARGETS kolab-freebusyd
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+)
+
+# add_subdirectory(tests)