Branch 'kolab/integration/4.13.0' - resources/CMakeLists.txt

[Sandro Knauß]

 resources/CMakeLists.txt |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 38b7ee8d72361be1645debeef6b921ce2c6fe64f
Author: Sandro Knauß <mail at sandroknauss.de>
Date:   Wed Oct 22 17:13:07 2014 +0200

    make more resources optional
    
    KOLAB: 3818

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 548268c..9487d61 100644
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -46,33 +46,32 @@ if (KDEPIMLIBS_KRESOURCES_LIBS)
   add_subdirectory( kcal )
 endif()
 macro_optional_add_subdirectory( kdeaccounts )
-if (Libkolab_FOUND AND Libkolabxml_FOUND)
-    macro_optional_add_subdirectory( kolabproxy )
-    add_subdirectory( kolab )
-endif()
+
+macro_optional_add_subdirectory( kolabproxy )
+macro_optional_add_subdirectory( kolab )
 
 macro_optional_add_subdirectory( localbookmarks )
 
 add_subdirectory( maildir )
 
 macro_optional_add_subdirectory( openxchange )
-add_subdirectory( pop3 )
+macro_optional_add_subdirectory( pop3 )
 
 if( LibKGAPI2_FOUND )
-  add_subdirectory( google )
+  macro_optional_add_subdirectory( google )
 endif()
 
 if( LibKFbAPI_FOUND )
-  add_subdirectory( facebook )
+  macro_optional_add_subdirectory( facebook )
 endif()
 
 add_subdirectory( shared )
 add_subdirectory( birthdays )
-add_subdirectory( mixedmaildir )
-add_subdirectory( mailtransport_dummy )
+macro_optional_add_subdirectory( mixedmaildir )
+macro_optional_add_subdirectory( mailtransport_dummy )
 add_subdirectory( mbox )
-add_subdirectory( nntp )
-add_subdirectory( vcarddir )
-add_subdirectory( icaldir )
+macro_optional_add_subdirectory( nntp )
+macro_optional_add_subdirectory( vcarddir )
+macro_optional_add_subdirectory( icaldir )
 add_subdirectory( vcard )
 add_subdirectory( folderarchivesettings )