Skip to content
Snippets Groups Projects
Commit e00afce4 authored by Radovan Červený's avatar Radovan Červený
Browse files

took out unnecesarry dependence on alib2data

parent c9ccec7d
No related branches found
No related tags found
1 merge request!15BP_cervera3 - automatic measurements, processing
EXECUTABLE:=ameasure2 EXECUTABLE:=ameasure2
LINK_PATHS=../alib2data/ ../alib2common/ ../alib2std/ LINK_PATHS=../alib2common/ ../alib2std/
LINK_LIBRARIES=alib2data alib2common alib2std xml2 LINK_LIBRARIES=alib2common alib2std xml2
INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2data/src/ \$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/ INCLUDE_PATHS=\$$(SOURCES_BASE_DIR)/../../alib2common/src/ \$$(SOURCES_BASE_DIR)/../../alib2std/src/ /usr/include/libxml2/
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
#include "provisioner/MeasurementProvisionerConfigurationXml.hpp" #include "provisioner/MeasurementProvisionerConfigurationXml.hpp"
#include "provisioner/MeasurementProvisionerResultsXml.hpp" #include "provisioner/MeasurementProvisionerResultsXml.hpp"
#include "provisioner/MeasurementProvisioner.hpp" #include "provisioner/MeasurementProvisioner.hpp"
#include "factory/XmlDataFactory.hpp" #include "exception/CommonException.h"
#include "sax/SaxParseInterface.h"
#include <tclap/CmdLine.h> #include <tclap/CmdLine.h>
#include <measure> #include <measure>
   
...@@ -33,9 +34,6 @@ int main ( int argc, char * * argv ) { ...@@ -33,9 +34,6 @@ int main ( int argc, char * * argv ) {
   
return 0; return 0;
   
} catch ( const exception::AlibException & exception ) {
alib::XmlDataFactory::toStdout ( exception );
return 1;
} catch ( const exception::CommonException & exception ) { } catch ( const exception::CommonException & exception ) {
std::cerr << "CommonException caught: " << exception.getCause ( ) << std::endl; std::cerr << "CommonException caught: " << exception.getCause ( ) << std::endl;
return 4; return 4;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment