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

List:       kde-commits
Subject:    KDE/kdevplatform/plugins
From:       Fathi Boudra <fboudra () free ! fr>
Date:       2009-01-01 15:07:46
Message-ID: 1230822466.673449.21479.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 904180 by fabo:

* Update dependencies.txt to build teamwork plugin.
* Fix Boost detection to build teamwork plugin:
  - search for iostreams and serialization components as they are the
    requirements. thread component isn't used.
  - remove CheckIncludeFilesCXX as it doesn't work properly.
    we use macro_optional_find_package to check iostreams component so we
    don't need to test iostreams includes.
    polymorphic_*archive.hpp fails to compile and these files are part of
    boost base files anyway.
  - update related macro_log_feature text.

CCMAIL: apaku@gmx.de



 M  +3 -27     CMakeLists.txt  
 M  +12 -6     teamwork/lib/network/dependencies.txt  


--- trunk/KDE/kdevplatform/plugins/CMakeLists.txt #904179:904180
@@ -1,5 +1,3 @@
-include(CheckIncludeFileCXX)
-
 macro_optional_add_subdirectory(duchainviewer)
 macro_optional_add_subdirectory(konsole)
 add_subdirectory(filemanager)
@@ -17,33 +15,12 @@
 add_subdirectory(sourceformatter)
 
 macro_optional_find_package(Commoncpp)
-#TODO: Improve detection, apparently we use headers that are not part of either
-#      of these two libs, need to check for that.
-macro_optional_find_package(Boost COMPONENTS thread serialization )
+macro_optional_find_package(Boost 1.34.0 COMPONENTS iostreams serialization)
 if(COMMONCPP2_FOUND AND Boost_FOUND)
-    macro_push_required_vars()
-    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${Boost_INCLUDE_DIRS})
-    check_include_file_cxx("boost/iostreams/categories.hpp" BOOST_HAS_CATEGORIES)
-    check_include_file_cxx("boost/iostreams/stream.hpp" BOOST_HAS_STREAM)
-    check_include_file_cxx("boost/iostreams/positioning.hpp" BOOST_HAS_POSITIONING)
-    check_include_file_cxx("boost/archive/polymorphic_xml_iarchive.hpp" \
                BOOST_HAS_XMLIARCHIVE)
-    check_include_file_cxx("boost/archive/polymorphic_xml_oarchive.hpp" \
                BOOST_HAS_XMLOARCHIVE)
-    check_include_file_cxx("boost/archive/polymorphic_text_oarchive.hpp" \
                BOOST_HAS_TXTIARCHIVE)
-    check_include_file_cxx("boost/archive/polymorphic_text_iarchive.hpp" \
                BOOST_HAS_TXTOARCHIVE)
-    macro_pop_required_vars()
-    if( NOT BOOST_HAS_CATEGORIES OR NOT BOOST_HAS_STREAM OR NOT \
                BOOST_HAS_POSITIONING )
-        message( STATUS "Didn't find needed headers (categories.hpp, stream.hpp and \
                positioning.hpp) from Boost iostreams library")
-    else( NOT BOOST_HAS_CATEGORIES OR NOT BOOST_HAS_STREAM OR NOT \
                BOOST_HAS_POSITIONING )
-      if( NOT BOOST_HAS_XMLIARCHIVE OR NOT BOOST_HAS_XMLOARCHIVE OR NOT \
                BOOST_HAS_TXTIARCHIVE OR NOT BOOST_HAS_TXTOARCHIVE )
-        message( STATUS "Didn't find needed headers \
                (polymorphic_(xml,txt)_(iarchive,oarchive).hpp) from Boost archive \
                library")
-      else( NOT BOOST_HAS_XMLIARCHIVE OR NOT BOOST_HAS_XMLOARCHIVE OR NOT \
                BOOST_HAS_TXTIARCHIVE OR NOT BOOST_HAS_TXTOARCHIVE )
-        macro_optional_add_subdirectory(teamwork)
-      endif( NOT BOOST_HAS_XMLIARCHIVE OR NOT BOOST_HAS_XMLOARCHIVE OR NOT \
                BOOST_HAS_TXTIARCHIVE OR NOT BOOST_HAS_TXTOARCHIVE )
-    endif( NOT BOOST_HAS_CATEGORIES OR NOT BOOST_HAS_STREAM OR NOT \
                BOOST_HAS_POSITIONING )
-
+    macro_optional_add_subdirectory(teamwork)
 endif(COMMONCPP2_FOUND AND Boost_FOUND)
 macro_log_feature( COMMONCPP2_FOUND "Common C++2" "Support for Teamwork plugin \
integration" "http://ftp.gnu.org/pub/gnu/commoncpp/" FALSE "1.5.9" "The commoncpp2 \
                libraries are needed for the Teamwork plugin" )
-macro_log_feature( Boost_FOUND "Boost" "Support for Teamwork plugin integration" \
"http://www.boost.org/" FALSE "1.34.0" "The thread and serialization components of \
the boost C++ libraries are needed for the Teamwork plugin" ) +macro_log_feature( \
Boost_FOUND "Boost" "Support for Teamwork plugin integration" "http://www.boost.org/" \
FALSE "1.34.0" "The iostreams and serialization components of the boost C++ libraries \
are needed for the Teamwork plugin" )  
 macro_optional_find_package(SubversionLibrary)
 macro_log_feature( SUBVERSION_FOUND "Subversion" "Support for Subversion \
integration" "http://subversion.tigris.org" FALSE "1.3.0" "The subversion libraries \
are needed for the Subversion support" ) @@ -58,4 +35,3 @@
 
 macro_display_feature_log()
 
-
--- trunk/KDE/kdevplatform/plugins/teamwork/lib/network/dependencies.txt \
#904179:904180 @@ -1,7 +1,13 @@
-To build, this project needs(descriptions followed by their debian package-names):
-Common-C++( libcommoncpp2-dev )
-Boost's serialization-library( libboost-serialization-dev )
-Boost's threading-library( libboost-thread-dev )
-Boost's iostream-library (libbost-iostreams-dev )
+To build, this project needs:
+- Common C++
+- Boost iostream library
+- Boost serialization library
 
-Although this is located within the kdevelop-tree, kdevelop is no dependency of this \
code. \ No newline at end of file
+Under Debian/Ubuntu, found below their respective package names:
+- libcommoncpp2-dev
+- libboost-iostreams-dev
+- libboost-serialization-dev
+
+Although this is located within the kdevelop-tree,
+kdevelop is no dependency of this code.
+


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