[Kde-pim] kdesupport/akonadi

[Alexander Neundorf]

SVN commit 891506 by neundorf:

-renamed project() from "akonadi" to "Akonadi"
-remove some unnecessary include dirs (CMAKE_SOURCE_DIR/akonadi was probably added by somebody building akonadi as part of kdesupport,
and CMAKE_SOURCE_DIR was probably added by somebody building akonadi separate, so now use the project specific Akonadi_(SOURCE|BINARY)_DIR variables instead which point always to the same directory)

It still builds both separate and as part of kdesupport, so I think it should be ok.

Alex

CCMAIL: winter at kde.org
CCMAIL: kde-pim at kde.org



 M  +7 -3      CMakeLists.txt  
 M  +5 -6      libs/CMakeLists.txt  
 M  +5 -2      server/CMakeLists.txt  
 M  +0 -4      server/akonadictl/CMakeLists.txt  
 M  +0 -2      server/control/CMakeLists.txt  
 M  +0 -2      server/queryserver/CMakeLists.txt  


--- trunk/kdesupport/akonadi/CMakeLists.txt #891505:891506
@@ -1,4 +1,4 @@
-project(akonadi)
+project(Akonadi)
 
 cmake_minimum_required(VERSION 2.4.5 FATAL_ERROR)
 
@@ -89,8 +89,12 @@
 
 ################# build targets ########################
 
-#message(STATUS "akonadi src: ${akonadi_SOURCE_DIR} bin: ${akonadi_BINARY_DIR}")
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/akonadi ${QT_INCLUDES})
+# Use the project specific source and binary directories, they are always the same
+# both when building akonadi as part of kdesupport or separate CMAKE_(SOURCE|BINARY)_DIR
+# are the root directory of the cmake build tree, i.e. kdesupport/ if akonadi is built
+# as part o kdesupport and kdesupport/akonadi/ if it is build separate.
+# (CMAKE_CURRENT_(SOURCE|BINARY)_DIR are also always the same). Alex
+include_directories(${Akonadi_SOURCE_DIR} ${Akonadi_BINARY_DIR} ${QT_INCLUDES})
 
 # if something breaks because the block below is commented out, 
 # please send me an email, Alex <neundorf at kde.org>
--- trunk/kdesupport/akonadi/libs/CMakeLists.txt #891505:891506
@@ -1,12 +1,11 @@
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII ${_ENABLE_EXCEPTIONS}" )
 
-cmake_policy(SET CMP0003 NEW)
+# according to akonadi/CMakeLists.txt still cmake 2.4.5 is required,
+# which doesn't have this command, so only do it if it exists. Alex
+if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
 
-include_directories(
-   ${CMAKE_BINARY_DIR}/akonadi
-   ${QT_QTDBUS_INCLUDE_DIR}
-   )
-
 # libakonadiprotocolinternals
 set( akonadiprotocolinternals_srcs
   imapparser.cpp
--- trunk/kdesupport/akonadi/server/CMakeLists.txt #891505:891506
@@ -6,7 +6,11 @@
 # macro_log_feature(OPENSSL_FOUND "OpenSSL" "A toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols" "http://openssl.org" FALSE "" "Required for building the Akonadi SQL plugin with MySQL embedded.")
 
 
-cmake_policy(SET CMP0003 NEW)
+# according to akonadi/CMakeLists.txt still cmake 2.4.5 is required,
+# which doesn't have this command, so only do it if it exists. Alex
+if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0003 NEW)
+endif(COMMAND cmake_policy)
 
 find_program( MYSQLD_EXECUTABLE mysqld /usr/sbin /usr/local/sbin /usr/libexec /opt/mysql/libexec )
 macro_log_feature( MYSQLD_EXECUTABLE "MySQL Server" "Database server" "http://www.mysql.com" FALSE ""
@@ -20,7 +24,6 @@
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src/handler )
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/shared )
-include_directories( ${QT_QTDBUS_INCLUDE_DIR} )
 
 set( AKONADI_SHARED_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/shared/akcrash.cpp
--- trunk/kdesupport/akonadi/server/akonadictl/CMakeLists.txt #891505:891506
@@ -1,7 +1,3 @@
-include_directories(
-  ${CMAKE_BINARY_DIR}/akonadi
-  ${QT_QTDBUS_INCLUDE_DIR}
-)
 
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_ENABLE_EXCEPTIONS}" )
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
--- trunk/kdesupport/akonadi/server/control/CMakeLists.txt #891505:891506
@@ -1,6 +1,4 @@
 include_directories( BEFORE
-  ${CMAKE_BINARY_DIR}/akonadi
-  ${QT_QTDBUS_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${Boost_INCLUDE_DIR}
--- trunk/kdesupport/akonadi/server/queryserver/CMakeLists.txt #891505:891506
@@ -1,6 +1,4 @@
 include_directories(
-  ${CMAKE_BINARY_DIR}/akonadi
-  ${QT_QTDBUS_INCLUDE_DIR}
   ${SOPRANO_INCLUDE_DIR}
 )
 
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/