Browse Source

Added dependecy information and surrounding defines; Clang fix

Clemens-Alexander Brust 11 năm trước cách đây
mục cha
commit
5b9a050cda

+ 2 - 0
features/simplefeatures/progs/libdepend.inc

@@ -0,0 +1,2 @@
+$(call PKG_DEPEND_EXT,MATIO)
+$(call PKG_DEPEND_EXT,HDF5)

+ 11 - 0
features/simplefeatures/progs/progCodebookRandomForest.cpp

@@ -16,6 +16,7 @@
 
 #include "vislearning/cbaselib/FeaturePool.h"
 
+#ifdef NICE_USELIB_MATIO
 #include <core/matlabAccess/MatFileIO.h>
 
 const bool verbose = false;
@@ -314,9 +315,16 @@ bool generateHistogram( const structCommands &p_Command)
 }
 
 
+#endif
 int main(int argc, char **argv)
 {
+
+#ifdef NICE_USELIB_MATIO
+#ifndef __clang__
+#ifndef __llvm__
     std::set_terminate(__gnu_cxx::__verbose_terminate_handler);
+#endif
+#endif
 
     structCommands sCommand;
 
@@ -386,6 +394,9 @@ int main(int argc, char **argv)
     {
         std::cerr << "exception occured: " << e.what() << std::endl;
     }
+#else
+    return -1;
+#endif	
 
     return 0;
 }