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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs/qgpgme
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-06-14 11:28:49
Message-ID: 1213442929.330180.14818.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 820458 by mutz:

Re-enable event loop integration on Unix, where it can co-exist with multithreaded mode.

 M  +5 -4      CMakeLists.txt  


--- branches/kdepim/enterprise4/kdepimlibs/qgpgme/CMakeLists.txt #820457:820458
@@ -3,7 +3,8 @@
 
 if ( WIN32 AND GPGME_VANILLA_FOUND )
 
-   # on Windows, we require gpgme(-vanilla), which is thread-safe
+   # on Windows, we require gpgme(-vanilla), which is thread-safe,
+   # and we don't provide gpgme-qt support
 
    set( _any_gpgme_found true )
    set( _qgpgme_libgpgme gpgmepp )
@@ -19,7 +20,8 @@
 
    set( _any_gpgme_found true )
    set( _qgpgme_libgpgme gpgmepp-pthread )
-   #set( _qgpgme_extra_src eventloopinteractor_unix.cpp )
+   set( _qgpgme_extra_src eventloopinteractor.cpp eventloopinteractor_unix.cpp )
+   set( _qgpgme_extra_headers eventloopinteractor.h )
 
 endif ( NOT WIN32 AND GPGME_PTHREAD_FOUND )
 
@@ -33,7 +35,6 @@
 
    set( qgpgme_LIB_SRCS
         dataprovider.cpp
-        #eventloopinteractor.cpp
         ${_qgpgme_extra_src}
    )
 
@@ -50,7 +51,7 @@
 
    install( FILES
      qgpgme_export.h
-     #eventloopinteractor.h
+     ${_qgpgme_extra_headers}
      dataprovider.h 
      DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme COMPONENT Devel )
 
[prev in list] [next in list] [prev in thread] [next in thread]