KDE/kdevplatform

[Aleix Pol Gonzalez]

SVN commit 1006594 by apol:

Properly pass the static HAVE_KOMPARE information to the compiler.
Give more information to the user that doesn't have Kompare installed

CCMAIL: kdevelop-devel at barney.cs.uni-potsdam.de


 M  +2 -2      CMakeLists.txt  
 M  +1 -5      language/codegen/komparesupport.h  


--- trunk/KDE/kdevplatform/CMakeLists.txt #1006593:1006594
@@ -16,9 +16,9 @@
 
 macro_optional_find_package(Kompare)
 macro_bool_to_01(KOMPARE_FOUND HAVE_KOMPARE)
-macro_log_feature(KOMPARE_FOUND "Kompare" "KPart to view file differences"
+macro_log_feature(KOMPARE_FOUND "Kompare" "KPart to view file differences."
                         "http://www.caffeinated.me.uk/kompare/" FALSE ""
-                        "Required for difference checking")
+                        "Required for difference checking. From KDE SDK package.")
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-kdevplatform.h.cmake
                 ${CMAKE_CURRENT_BINARY_DIR}/config-kdevplatform.h )
 
--- trunk/KDE/kdevplatform/language/codegen/komparesupport.h #1006593:1006594
@@ -33,11 +33,7 @@
 class KompareWidgets
 {
   public:
-#ifdef WITH_KOMPARE
-    static const bool enabled = 1;
-#else
-    static const bool enabled = 0;
-#endif
+    static const bool enabled = HAVE_KOMPARE;
 
     KompareWidgets();
     ~KompareWidgets();