markusro/damaris-backends
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Wiki Activity

Merge branch 'master' of ssh://chaos3.fkp.physik.tu-darmstadt.de/source/damaris

Browse Source
This commit is contained in:
Markus Rosenstihl 2018-12-12 09:45:42 +01:00
commit b3c0e85c0c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/xml_result.cpp
View File

@ -575,7 +575,7 @@ int xml_result_writer::write_adc_to_file(const std::string& filename, const adc_
break; break;
default: default:
/* forget data */ /* forget data */
fprintf(stderr,"forgeting adc data\n"); fprintf(stderr,"forgetting adc data\n");
} }
fprintf(out,"</result>\n"); fprintf(out,"</result>\n");
fclose(out); fclose(out);

1
drivers/Spectrum-MI40xxSeries/CMakeLists.txt
View File

@ -37,6 +37,7 @@ if(EXISTS ${MITGZ})
add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv
COMMAND tar xfvz ${MITGZ} COMMAND tar xfvz ${MITGZ}
COMMAND cp -v ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/makefile.kernel26 ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/Makefile COMMAND cp -v ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/makefile.kernel26 ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/Makefile
COMMAND sed -i 's/-Wno-deprecated-declarations/Wno-deprecated-declarations -w' ${CMAKE_CURRENT_SOURCE_DIR}/linux/src_all/micx_drv/Makefile
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Unpacking Spectrum driver tarball" COMMENT "Unpacking Spectrum driver tarball"
VERBATIM) VERBATIM)