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

List:       kde-commits
Subject:    koffice/tools
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-10-08 14:12:20
Message-ID: 20101008141220.0A52BAC892 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1183855 by rempt:

Properly use cmake to find libraries instead of hardcoding them

CCMAIL:Sugnan Prabhu <sugnan.prabhu@gmail.com>

 M  +9 -2      CMakeLists.txt  
 M  +2 -2      f-office/CMakeLists.txt  


--- trunk/koffice/tools/CMakeLists.txt #1183854:1183855
@@ -14,11 +14,18 @@
 
 macro_optional_find_package(X11)
 macro_optional_find_package(Qt4)
-if(X11_FOUND)
+macro_optional_find_package(LibXml2) # f-office uses xml2 directly
+macro_log_feature(LIBXML2_FOUND "XML2" "A library for handling XML documents" \
"http://xmlsoft.org" FALSE "" "FreOffice uses XML2 for digital signatures") \
+macro_optional_find_package(OpenSSL) # f-office uses ssl directly \
+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 ""  +"FreOffice uses OpenSSL for digital signatures")
+
+
+if(X11_FOUND AND LIBXML2_FOUND AND OPENSSL_FOUND)
 if(Q_WS_X11 AND SHOULD_BUILD_KSPREAD)
   macro_optional_add_subdirectory( f-office )
 endif(Q_WS_X11 AND SHOULD_BUILD_KSPREAD)
-endif(X11_FOUND)
+endif(X11_FOUND AND LIBXML2_FOUND AND OPENSSL_FOUND)
 
 # strigi ships with the odfsaxanalyzer which does already fetch the meta-data of
 # odf files. Also the current implementations of the analyzers are deactivated
--- trunk/koffice/tools/f-office/CMakeLists.txt #1183854:1183855
@@ -41,9 +41,9 @@
 
 
 if(QT_QMAEMO5_LIBRARY)
-    target_link_libraries(FreOffice ${QT_LIBRARIES} ${QT_QMAEMO5_LIBRARY} \
${QT_QTNETWORK_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${X11_X11_LIB} komain kopageapp \
kwordprivate kspreadcommon xml2 ssl crypto soprano ) +    \
target_link_libraries(FreOffice ${QT_LIBRARIES} ${QT_QMAEMO5_LIBRARY} \
${QT_QTNETWORK_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${X11_X11_LIB} komain kopageapp \
kwordprivate kspreadcommon x${LIBXML2_LIBRARIES} ${OPENSSL_LIBRARIES} \
${SOPRANO_LIBRARIES} )  else(QT_QMAEMO5_LIBRARY)
-    target_link_libraries(FreOffice ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} \
${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ${X11_X11_LIB} komain kopageapp \
kwordprivate kspreadcommon xml2 ssl crypto) +    target_link_libraries(FreOffice \
${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} \
${X11_X11_LIB} komain kopageapp kwordprivate kspreadcommon ${LIBXML2_LIBRARIES} \
${OPENSSL_LIBRARIES} )  endif(QT_QMAEMO5_LIBRARY)
 
 install(TARGETS FreOffice RUNTIME DESTINATION bin)


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