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

[Barth Netterfield]

SVN commit 1217337 by netterfield:

Under ubuntu 10.10, GETDATA_INCLUDEDIR and GETDATA_LIBRARIES are set by pkg_check_modules, but
GETDATA_LIBRARY_C and GETDATA_LIBRARY_CPP are not.

This temporary hack ignores pkg_check_modules and just looks for the libraries by hand.  Not sure
what the correct solution is, but it probably isn't this.



 M  +8 -4      FindGetdata.cmake  


--- branches/work/kst/portto4/kst/cmake/modules/FindGetdata.cmake #1217336:1217337
@@ -2,8 +2,12 @@
 include(FindPkgConfig)
 
 pkg_check_modules(GETDATA QUIET getdata>=0.6.0)
+message(STATUS "GD inc: ${GETDATA_INCLUDEDIR}")
+message(STATUS "GD libs: ${GETDATA_LIBRARIES}")
 
-if(NOT GETDATA_INCLUDEDIR AND NOT 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)
 	set(GETDATA_INCLUDEDIR GETDATA_INCLUDEDIR-NOTFOUND CACHE STRING "" FORCE)
 	FIND_PATH(GETDATA_INCLUDEDIR getdata.h
 		HINTS
@@ -23,11 +27,11 @@
 		PATH_SUFFIXES lib
 		PATHS
 		)
-endif()
+#endif()
 
 #message(STATUS "GD: ${GETDATA_INCLUDEDIR}")
-#message(STATUS "GD: ${GETDATA_LIBRARY_C}")
-#message(STATUS "GD: ${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})