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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/kleopatra
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-03-12 10:03:32
Message-ID: 1268388212.949904.19879.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1102337 by mutz:

kleopatra/config-kleopatra.h.cmake: move KLEOPATRA_VERSION_STRING to spearate \
kleopatra-version.h.cmake

This hopefully will get rid of some of the excessive recompiles I'm seeing.

 M  +1 -0      CMakeLists.txt  
 M  +1 -0      aboutdata.cpp  
 M  +0 -2      config-kleopatra.h.cmake  
 A             kleopatra-version.h.cmake  
 M  +1 -0      uiserver/assuanserverconnection.cpp  


--- branches/kdepim/enterprise4/kdepim/kleopatra/CMakeLists.txt #1102336:1102337
@@ -18,6 +18,7 @@
 endif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
 endif (NOT kleopatra_release)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kleopatra.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-kleopatra.h ) \
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kleopatra-version.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/kleopatra-version.h )  
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
--- branches/kdepim/enterprise4/kdepim/kleopatra/aboutdata.cpp #1102336:1102337
@@ -31,6 +31,7 @@
 */
 
 #include <config-kleopatra.h>
+#include <kleopatra-version.h>
 
 #include "aboutdata.h"
 
--- branches/kdepim/enterprise4/kdepim/kleopatra/config-kleopatra.h.cmake \
#1102336:1102337 @@ -21,8 +21,6 @@
 /* Define to 1 if you build libkleopatraclient */
 #cmakedefine HAVE_KLEOPATRACLIENT_LIBRARY 1
 
-#define KLEOPATRA_VERSION_STRING "@kleopatra_version@"
-
 #if defined _WIN32 || defined _WIN64
 #include <kde_file_win.h>
 #endif
--- branches/kdepim/enterprise4/kdepim/kleopatra/uiserver/assuanserverconnection.cpp \
#1102336:1102337 @@ -37,6 +37,7 @@
 #endif
 
 #include <config-kleopatra.h>
+#include <kleopatra-version.h>
 
 #include "assuanserverconnection.h"
 #include "assuancommand.h"


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