From 7a8eeda3578645f79fd47139adc4f8128856c60a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Nov 2011 21:11:09 -0600
Subject: [PATCH] CMake fixes

---
 CMakeLists.txt                 | 12 +++++++++++-
 config.h.cmake                 | 17 ++++++++++++++++-
 src/helpers/CMakeLists.txt     |  4 ++--
 src/ksvnwidgets/CMakeLists.txt |  4 ++--
 src/settings/CMakeLists.txt    |  2 +-
 src/svnfrontend/CMakeLists.txt |  2 +-
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efda0f9..01037a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,16 @@ IF(BUILD_TESTS)
 ENDIF(BUILD_TESTS)
 
 
+##### versioning ################################
+
+SET(BASE_VERSION 1.0.4)
+SET(VERSION "$ENV{KDESVN_VERSION}")
+IF(NOT VERSION)
+  SET(VERSION ${BASE_VERSION})
+ENDIF(NOT VERSION)
+SET(KDESVN_VERSION \"${VERSION}\")
+
+
 ##### configure checks ##########################
 
 include( ConfigureChecks.cmake )
@@ -93,4 +103,4 @@ configure_file( tdesvn.spec.in tdesvn.spec @ONLY )
 configure_file( Helperstuff/BuildService/tdesvn.spec.in Helperstuff/BuildService/tdesvn.spec @ONLY )
 configure_file( Helperstuff/BuildService/tdesvn.dsc.in Helperstuff/BuildService/tdesvn.dsc @ONLY )
 configure_file( Doxyfile.in Doxyfile @ONLY )
-configure_file( Doxyfile.svnqt.in Doxyfile.svnqt @ONLY )
\ No newline at end of file
+configure_file( Doxyfile.svnqt.in Doxyfile.svnqt @ONLY )
diff --git a/config.h.cmake b/config.h.cmake
index d81a482..ef02678 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,5 +1,20 @@
+ifndef _KDESVN_CONFIG_H
+#define _KDESVN_CONFIG_H
+
 #cmakedefine SIZEOF_INT @SIZEOF_INT@
 #cmakedefine SIZEOF_LONG @SIZEOF_LONG@
 #cmakedefine HAVE_STDINT_H 1
 #cmakedefine HAVE_SYSTEMS_H 1
-#cmakedefine HAVE_STATVFS 1
\ No newline at end of file
+#cmakedefine HAVE_STATVFS 1
+
+#cmakedefine VERSION @KDESVN_VERSION@
+
+#cmakedefine SQLITE_FOUND
+#cmakedefine HAS_SETENV
+
+#define KDESVN_EXPORT @_KDESVN_EXPORT@
+#define KDESVN_NOEXPORT @_KDESVN_NOEXPORT@
+
+#define WALLETNAME "@PROJECT_NAME@"
+
+#endif
diff --git a/src/helpers/CMakeLists.txt b/src/helpers/CMakeLists.txt
index 80f2200..66784a7 100644
--- a/src/helpers/CMakeLists.txt
+++ b/src/helpers/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 ##### tdesvnhelpers ##############################
 
 tde_add_library( tdesvnhelpers STATIC AUTOMOC
-  SOURCES helperssrc ktranslateurl.cpp sshagent.cpp sub2qt.cpp
+  SOURCES ktranslateurl.cpp sshagent.cpp sub2qt.cpp
 #  LINK kio-shared
   DESTINATION ${LIB_INSTALL_DIR}
-)
\ No newline at end of file
+)
diff --git a/src/ksvnwidgets/CMakeLists.txt b/src/ksvnwidgets/CMakeLists.txt
index e038d82..93c9501 100644
--- a/src/ksvnwidgets/CMakeLists.txt
+++ b/src/ksvnwidgets/CMakeLists.txt
@@ -29,11 +29,11 @@ tde_add_library( ksvnwidgets STATIC AUTOMOC
   SOURCES authdialogimpl.cpp logmsg_impl.cpp ssltrustprompt_impl.cpp
     pwstorage.cpp diffbrowser.cpp diffbrowserdata.cpp
     diffsyntax.cpp encodingselector_impl.cpp depthselector.cpp
-    revertform_impl.cpp tdesvn_shared_ui logmessage.ui
+    revertform_impl.cpp logmessage.ui
     ssltrustprompt.ui authdlg.ui encodingselector.ui
     depthform.ui revertform.ui
 #  LINK kio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
-# ADD_DEPENDENCIES(ksvnwidgets tdesvncfgreader)
\ No newline at end of file
+# ADD_DEPENDENCIES(ksvnwidgets tdesvncfgreader)
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index d4c9b4a..7676ef5 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 file (GLOB hdr RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
 
 tde_add_library( tdesvncfgreader STATIC AUTOMOC
-  SOURCES settings_ui_sources dispcolor_settings.ui
+  SOURCES dispcolor_settings.ui
     display_settings.ui revisiontree_settings.ui
     subversion_settings.ui cmdexecsettings.ui
     diffmergesettings.ui dispcolorsettings_impl.cpp
diff --git a/src/svnfrontend/CMakeLists.txt b/src/svnfrontend/CMakeLists.txt
index 8ba55a5..bbee4cd 100644
--- a/src/svnfrontend/CMakeLists.txt
+++ b/src/svnfrontend/CMakeLists.txt
@@ -98,4 +98,4 @@ tde_add_library( svnfrontend STATIC AUTOMOC
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
-ADD_DEPENDENCIES(svnfrontend ksvnwidgets)
+# ADD_DEPENDENCIES(svnfrontend ksvnwidgets)