[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2007-11-19 15:16:27
Message-ID: 1195485387.429276.14638.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 738741 by osterfeld:

the old check for kdepimlibs doesn't work anymore, as FindKDEPimlibs 
checks for kcal, which we do not build in ONLY_KLEO, but we need kdepimlibs 
to be found to have KDE4_KMIME_LIBRARY and friends set correctly.
Our patched FindKDEPimLibs.cmake checks for kmime now, and we require kdepimlibs for \
kleopatra.


 M  +5 -9      CMakeLists.txt  
 M  +4 -4      kleopatra/CMakeLists.txt  


--- branches/work/kdab-post-4.0/kdepim/CMakeLists.txt #738740:738741
@@ -36,10 +36,11 @@
         TARGET_LINK_LIBRARIES(${LINK_ARG_LIST})
 endmacro (KDEPIM4_LINK_UNIQUE_LIBRARIES)
 
+find_package(KdepimLibs REQUIRED)
+find_package(Boost REQUIRED)
+macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org/" \
TRUE "" "Required by Akonadi and kleopatra") +
 if ( ONLY_KLEO )
-  find_package(KdepimLibs)
-  find_package(Boost REQUIRED )
-  macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" \
"http://www.boost.org/" TRUE "" "Required by Akonadi and kleopatra")  \
find_package(QGpgme REQUIRED)  add_definitions (-D_FILE_OFFSET_BITS=64 \
-D_LARGE_FILES) # for off_t  add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} \
-DHAVE_CONFIG_H=1) @@ -52,16 +53,11 @@
   else(TOPOLOGICAL_SORT_DIR)
     MESSAGE(STATUS "topological_sort.hpp is necessary to compile kleopatra. Please \
install package which contains it.")  endif(TOPOLOGICAL_SORT_DIR)
-else ( ONLY_KLEO )
 
-
-find_package(KdepimLibs REQUIRED)
+else ( ONLY_KLEO )
 find_package(Kode REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(Strigi REQUIRED)
-find_package(Boost REQUIRED )
-macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org/" \
                TRUE "" "Required by Akonadi and kleopatra")
-
 if(Q_WS_X11)
    macro_log_feature(X11_Xscreensaver_LIB "libXss" "X Window Screen Saver \
Development Library" "http://xorg.freedesktop.org" FALSE "" "Required for building \
the KTimeTracker Program")  endif(Q_WS_X11)
--- branches/work/kdab-post-4.0/kdepim/kleopatra/CMakeLists.txt #738740:738741
@@ -134,11 +134,11 @@
 set_target_properties(kleopatra_bin  PROPERTIES OUTPUT_NAME kleopatra)
 
 if ( KLEO_BUILD_OLD_MAINWINDOW )
-  if ( KDEPIMLIBS_FOUND )
+  if ( ONLY_KLEO )
+    set( _kleopatra_extra_libs ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
+  else ( ONLY_KLEO )
     set( _kleopatra_extra_libs ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} \
                ${KDE4_KABC_LIBS} )
-  else ( KDEPIMLIBS_FOUND )
-    set( _kleopatra_extra_libs ${KDE4_KUTILS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
-  endif ( KDEPIMLIBS_FOUND )
+  endif ( ONLY_KLEO )
 else ( KLEO_BUILD_OLD_MAINWINDOW )
   set( _kleopatra_extra_libs ${QT_QT3SUPPORT_LIBRARY} )
 endif ( KLEO_BUILD_OLD_MAINWINDOW )


[prev in list] [next in list] [prev in thread] [next in thread]