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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-11-06 23:33:14
Message-ID: 1257550394.126118.27851.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1045939 by tmcguire:

Merged revisions 1043000 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r1043000 | mueller | 2009-10-31 14:09:22 +0100 (Sat, 31 Oct 2009) | 1 line
  
  backport r1042999
........


 _M            . (directory)  
 M  +1 -0      gpgme++/ConfigureChecks.cmake  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,9 \
96755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-101 \
3331,1013810,1015198,1015975-1016224,1016226-1016229,1019800,1021325,1024435,1026793,1031598,1035634,1036874
  + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,99 \
6755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013 \
331,1013810,1015198,1015975-1016224,1016226-1016229,1019800,1021325,1024435,1026793,1031598,1035634,1036874,1043000
                
--- branches/kdepim/enterprise4/kdepimlibs/gpgme++/ConfigureChecks.cmake \
#1045938:1045939 @@ -4,6 +4,7 @@
 if ( GPGME_FOUND )
 
 set(CMAKE_REQUIRED_INCLUDES ${GPGME_INCLUDES})
+set(CMAKE_REQUIRED_DEFINITIONS ${KDE4_DEFINITIONS})
 set(CMAKE_REQUIRED_LIBRARIES)
 foreach( _FLAVOUR VANILLA PTHREAD QT PTH GLIB )
   if ( NOT CMAKE_REQUIRED_LIBRARIES )


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