Skip to content
Snippets Groups Projects
Commit 786f5d73 authored by Arafat Nourredine's avatar Arafat Nourredine
Browse files

- Update pom.xml 

- #include Log.h instead of #include "log.h"
- add sdk package.zip
parent 0bb6af3c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
pom_64.xml
+ 20
− 16
View file @ 786f5d73
......@@ -4,16 +4,16 @@
<parent>
<groupId>fr.soleil</groupId>
<artifactId>super-pom-C-CPP-device</artifactId>
<version>RELEASE</version>
<version>20.2.0-64</version>
</parent>
<properties>
<PROJECT.name>DanteDpp</PROJECT.name>
<PROJECT.version>0.0.1-SNAPSHOT</PROJECT.version>
<PROJECT.version>1.1.0-SNAPSHOT</PROJECT.version>
<PROJECT.description>DanteDpp device</PROJECT.description>
<!-- path to the 64 bits libs ${libs-64bits} -->
<!--<libs-64bits>/home/informatique/ica/ica/LIB_EL6_64</libs-64bits>-->
<libs-64bits>/media/sf_Partage/DanteDpp/LIB_EL6_64</libs-64bits>
<libs-64bits>/home/informatique/ica/ica/LIB_EL6_64</libs-64bits>
<!--<libs-64bits>/media/sf_Partage/DanteDpp/LIB_EL6_64</libs-64bits>-->
</properties>
<groupId>fr.soleil.device</groupId>
......@@ -34,15 +34,19 @@
<includePaths>
<includePath>src</includePath>
<includePath>sdk</includePath>
<includePath>${libs-64bits}/yat-1.13.16/include</includePath>
<includePath>${libs-64bits}/libtango8-devel-8.1.2-16.el6.maxlab.x86_64/usr/include</includePath>
<includePath>${libs-64bits}/liblog4tango5-devel-5.0.0-16.el6.maxlab.x86_64/usr/include</includePath>
<includePath>${libs-64bits}/my_breakpad/include</includePath>
<includePath>${libs-64bits}/gsl-1.11/include</includePath>
<includePath>${libs-64bits}/lz4-r131/lib</includePath>
<includePath>${libs-64bits}/libtango8-devel-8.1.2-16.el6.maxlab.x86_64/usr/include/tango</includePath>
<includePath>${libs-64bits}/libtango8-devel-8.1.2-16.el6.maxlab.x86_64/usr/include/</includePath>
<includePath>${libs-64bits}/liblog4tango5-devel-5.0.0-16.el6.maxlab.x86_64/usr/include/tango</includePath>
<includePath>${libs-64bits}/omniORB-devel-4.1.7-1.el6.x86_64/usr/include</includePath>
<includePath>${libs-64bits}/zeromq-3.2.5/include</includePath>
<includePath>${libs-64bits}/hdf5-1.8.16/include</includePath>
<includePath>${libs-64bits}/yat-1.13.16/include</includePath>
<includePath>${libs-64bits}/yat4tango-1.10.6/include</includePath>
<includePath>${libs-64bits}/nexuscpp-3.2.2/include</includePath>
<includePath>${libs-64bits}/yat-1.17.5/include</includePath>
<includePath>${libs-64bits}/yat4tango-1.12.3/include</includePath>
<includePath>${libs-64bits}/nexuscpp-3.3.6/include</includePath>
</includePaths>
<!-- define less verbose mode for gcc-->
<options>
......@@ -149,23 +153,23 @@
<lib>
<!-- YAT (1.13.16) 64 -->
<name>YAT-amd64-Linux-gcc-shared-release-1.13.16</name>
<name>YAT-amd64-Linux-gcc-shared-release-1.17.5</name>
<type>shared</type>
<directory>${libs-64bits}/yat-1.13.16/lib</directory>
<directory>${libs-64bits}/yat-1.17.5/lib</directory>
</lib>
<lib>
<!-- YAT (1.10.4) 64 -->
<name>YAT4Tango-amd64-Linux-gcc-shared-release-1.10.6</name>
<name>YAT4Tango-amd64-Linux-gcc-shared-release-1.12.3</name>
<type>shared</type>
<directory>${libs-64bits}/yat4tango-1.10.6/lib</directory>
<directory>${libs-64bits}/yat4tango-1.12.3/lib</directory>
</lib>
<lib>
<!-- NexusCPP (3.2.2) 64 -->
<name>NexusCPP-amd64-Linux-gcc-shared-release-3.2.2</name>
<name>NexusCPP-amd64-Linux-gcc-shared-release-3.3.6</name>
<type>shared</type>
<directory>${libs-64bits}/nexuscpp-3.2.2/lib</directory>
<directory>${libs-64bits}/nexuscpp-3.3.6/lib</directory>
</lib>
<lib>
......
sdk/Updates/3.7.8.0-7.3.1-Callback-NO_USB-x64.zip 0 → 100644
+ 0
− 0
View file @ 786f5d73
File added
src/ConfigView.cpp
+ 1
− 1
View file @ 786f5d73
......@@ -22,7 +22,7 @@
// PROJECT
#include "ConfigView.h"
#include "log.h"
#include "Log.h"
#include "Helper.h"
namespace DanteDpp_ns
......
src/ConfigView.h
+ 1
− 1
View file @ 786f5d73
......@@ -19,7 +19,7 @@
// PROJECT
#include "ConfigViewParameters.h"
#include "log.h"
#include "Log.h"
#include "UserData.h"
namespace DanteDpp_ns
......
src/DataStore.h
+ 50
− 50
View file @ 786f5d73
src/RoisView.cpp
+ 1
− 1
View file @ 786f5d73
......@@ -22,7 +22,7 @@
// PROJECT
#include "RoisView.h"
#include "log.h"
#include "Log.h"
#include "RoisManager.h"
namespace DanteDpp_ns
......
src/RoisView.h
+ 1
− 1
View file @ 786f5d73
......@@ -19,7 +19,7 @@
// PROJECT
#include "RoisViewParameters.h"
#include "log.h"
#include "Log.h"
#include "UserData.h"
namespace DanteDpp_ns
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

The place to be for your source code