[Kst] branches/work/kst/portto4/kst/cmake/modules

[Peter Kümmel]

SVN commit 1217589 by kuemmel:

detection of getdata on ubuntu: no getdata++ found


 M  +13 -6     FindGetdata.cmake  


--- branches/work/kst/portto4/kst/cmake/modules/FindGetdata.cmake #1217588:1217589
@@ -2,12 +2,19 @@
 include(FindPkgConfig)
 
 pkg_check_modules(GETDATA QUIET getdata>=0.6.0)
-message(STATUS "GD inc: ${GETDATA_INCLUDEDIR}")
-message(STATUS "GD libs: ${GETDATA_LIBRARIES}")
+#message(STATUS "GD inc: ${GETDATA_INCLUDEDIR}")
+#message(STATUS "GD libs: ${GETDATA_LIBRARIES}")
 
 # FIXME: GETDATA_INCLUDEDIR AND GETDATA_LIBRARIES are set by pkg_check_modules, but
 # GETDATA_LIBRARY_C and GETDATA_LIBRARY_CPP are not.
-#if(NOT GETDATA_INCLUDEDIR AND NOT GETDATA_LIBRARIES)
+# Ubuntu: maybe /usr/local/lib/pkgconfig/getdata.pc is not correct
+if(GETDATA_LIBRARIES AND NOT GETDATA_LIBRARY_CPP)
+	set(GETDATA_LIBRARY_C ${GETDATA_LIBRARIES})
+	set(GETDATA_LIBRARY_CPP ${GETDATA_LIBRARIES}++)
+endif()
+
+
+if(NOT GETDATA_INCLUDEDIR AND NOT GETDATA_LIBRARIES)
 	set(GETDATA_INCLUDEDIR GETDATA_INCLUDEDIR-NOTFOUND CACHE STRING "" FORCE)
 	FIND_PATH(GETDATA_INCLUDEDIR getdata.h
 		HINTS
@@ -27,11 +34,11 @@
 		PATH_SUFFIXES lib
 		PATHS
 		)
-#endif()
+endif()
 
 #message(STATUS "GD: ${GETDATA_INCLUDEDIR}")
-message(STATUS "GD lib c: ${GETDATA_LIBRARY_C}")
-message(STATUS "GD lib c++: ${GETDATA_LIBRARY_CPP}")
+#message(STATUS "GD lib c: ${GETDATA_LIBRARY_C}")
+#message(STATUS "GD lib c++: ${GETDATA_LIBRARY_CPP}")
 IF(GETDATA_LIBRARY_C AND GETDATA_LIBRARY_CPP AND GETDATA_INCLUDEDIR)
 	MESSAGE(STATUS "Getdata found at ${GETDATA_INCLUDEDIR}")
     SET(GETDATA_LIBRARIES ${GETDATA_LIBRARY_CPP} ${GETDATA_LIBRARY_C})