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

[Peter Kümmel]

SVN commit 1213549 by kuemmel:

add some speculative FindDmc.cmake
wonder why I don't get any linker errors


 M  +1 -0      cmake/CMakeLists.txt  
 AM            cmake/modules/FindDmc.cmake  
 M  +2 -1      cmake/src/datasources/CMakeLists.txt  
 M  +3 -1      src/datasources/dmc/dmcdata.cpp  
 M  +1 -1      src/datasources/dmc/dmcdata.h  
 M  +2 -1      src/datasources/dmc/dmcobj.cpp  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1213548:1213549
@@ -43,6 +43,7 @@
   find_package(Gsl)
   find_package(Netcdf)
   find_package(CFITSIO)
+  find_package(Dmc)
   message(STATUS "----------------------------------------------")
 else()
   message(STATUS "Building plugins depending on 3rd party libraries suppressed")
--- branches/work/kst/portto4/kst/cmake/src/datasources/CMakeLists.txt #1213548:1213549
@@ -42,9 +42,10 @@
 	kst_add_plugin(. planckIDEF)
 endif()
 
-#set(dmc 1)
 if(dmc)
+  include_directories(${DMC_INCLUDE_DIR})
 	kst_add_plugin(. dmc)
+  #kst_link(${DMC_LIBRARIES})
 endif()
 
 message(STATUS)
--- branches/work/kst/portto4/kst/src/datasources/dmc/dmcdata.cpp #1213548:1213549
@@ -22,7 +22,9 @@
 using namespace DMC;
 
 
-namespace DMC {
+namespace DMC
+{
+
 bool haveDMC() {
   return true;
 }
--- branches/work/kst/portto4/kst/src/datasources/dmc/dmcdata.h #1213548:1213549
@@ -23,7 +23,7 @@
 #include "sharedptr.h"
 
 extern "C" {
-#include <HL2_DMC/PIODB.h>
+#include "HL2_DMC/PIODB.h"
 }
 
 #include <QSize>
--- branches/work/kst/portto4/kst/src/datasources/dmc/dmcobj.cpp #1213548:1213549
@@ -24,8 +24,9 @@
 
 //#define PIOLIBDEBUG
 #include "dmcobj.h"
-#include <HL2_PIOLIB/PIOErr.h>
 
+#include "HL2_PIOLIB/PIOErr.h"
+
 #ifdef NAN
 double NOPOINT = NAN;
 #else