[Kde-accessibility] Speech Dispatcher upcoming version

[Jeremy Whiting]

Hey all,

Speech-dispatcher trunk (and upcoming 0.8? release) has moved it's
libspeechd.h header into a speech-dispatcher/ subfolder inside of include,
so I tweaked our FindSpeechd.cmake to look for it there.  I've attached a
patch that finds it, then in our code we'll have to do

#ifdef SPEECHD_FOUND
#include <libspeechd.h>
#elseif NEW_SPEECHD_FOUND
#include <speech-dispatcher/libspeechd.h>
#endif

It's working here locally, but I'm unsure about the use of the word NEW
since it wont always be new (say they change it again for their next
release, something I hope they wouldn't do, but then new would be the new
old).

Thoughts?

Jeremy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.kde.org/pipermail/kde-accessibility/attachments/20110104/13e1c3bf/attachment.htm 
-------------- next part --------------
Index: cmake/modules/FindSpeechd.cmake
===================================================================
--- cmake/modules/FindSpeechd.cmake	(revision 1210308)
+++ cmake/modules/FindSpeechd.cmake	(working copy)
@@ -6,19 +6,28 @@
 
 FIND_PATH(SPEECHD_INCLUDE_DIR libspeechd.h /usr/include /usr/local/include)
 
+FIND_PATH(NEW_SPEECHD_INCLUDE_DIR speech-dispatcher/libspeechd.h /usr/include /usr/local/include)
+
 FIND_LIBRARY(SPEECHD_LIBRARY NAMES speechd PATH /usr/lib /usr/local/lib)
 
-IF (SPEECHD_INCLUDE_DIR AND SPEECHD_LIBRARY)
-    SET(SPEECHD_FOUND TRUE)
-ENDIF (SPEECHD_INCLUDE_DIR AND SPEECHD_LIBRARY)
+IF (SPEECHD_LIBRARY)
+    MESSAGE(STATUS "Found Speech Dispatcher Library")
+    IF (SPEECHD_INCLUDE_DIR)
+        MESSAGE(STATUS "Found old Speech Dispatcher headers")
+        SET(SPEECHD_FOUND TRUE)
+    ELSEIF (NEW_SPEECHD_INCLUDE_DIR)
+        MESSAGE(STATUS "Found new Speech Dispatcher headers")
+        SET(NEW_SPEECHD_FOUND TRUE)
+    ENDIF (SPEECHD_INCLUDE_DIR)
+ENDIF (SPEECHD_LIBRARY)
 
-IF (SPEECHD_FOUND)
+IF (SPEECHD_FOUND OR NEW_SPEECHD_FOUND)
   IF (NOT Speechd_FIND_QUIETLY)
     MESSAGE(STATUS "Found Speech Dispatcher: ${SPEECHD_LIBRARY}")
   ENDIF (NOT Speechd_FIND_QUIETLY)
-ELSE (SPEECHD_FOUND)
+ELSE (SPEECHD_FOUND OR NEW_SPEECHD_FOUND)
   IF (Speechd_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Could not find Required package: Speech Dispatcher")
   ENDIF (Speechd_FIND_REQUIRED)
-ENDIF (SPEECHD_FOUND)
+ENDIF (SPEECHD_FOUND OR NEW_SPEECHD_FOUND)