Skip to content
Snippets Groups Projects
Commit 86101c83 authored by Arafat NOUREDDINE's avatar Arafat NOUREDDINE
Browse files

Bug fix : Tango 9 compilation 

Add doc guide
parent bdabe346
Branches
Tags release_1_5_0
No related merge requests found
Show whitespace changes
Inline Side-by-side
pom.xml
+ 56
− 37
View file @ 86101c83
......@@ -4,16 +4,21 @@
<parent>
<groupId>fr.soleil</groupId>
<artifactId>super-pom-C-CPP-device</artifactId>
<version>20.2.0-64</version>
<version>21.2.5-64</version>
</parent>
<properties>
<PROJECT.name>DanteDpp</PROJECT.name>
<PROJECT.version>1.4.0</PROJECT.version>
<PROJECT.version>1.5.0</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>-->
<YAT.version>1.18.6</YAT.version>
<YAT4Tango.version>1.13.3</YAT4Tango.version>
<NexusCPP.version>3.4.0</NexusCPP.version>
</properties>
<groupId>fr.soleil.device</groupId>
......@@ -34,19 +39,26 @@
<includePaths>
<includePath>src</includePath>
<includePath>sdk</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}/libtango9-9.2.5-64/include/tango</includePath>
<includePath>${libs-64bits}/libtango9-9.2.5-64/include/</includePath>
<includePath>${libs-64bits}/hdf5-1.8.16/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>
<includePath>${libs-64bits}/yat-${YAT.version}/include</includePath>
<includePath>${libs-64bits}/yat4tango-${YAT4Tango.version}/include</includePath>
<includePath>${libs-64bits}/nexuscpp-${NexusCPP.version}/include</includePath>
</includePaths>
<!-- define less verbose mode for gcc-->
<options>
......@@ -61,59 +73,66 @@
<linker>
<libs>
<lib>
<!-- omniORB4 (1.6) 64 -->
<!-- breakpad (??) 64 -->
<name>breakpad_client</name>
<type>static</type>
<directory>${libs-64bits}/my_breakpad/lib</directory>
</lib>
<lib>
<!-- omniORB4 64 -->
<name>omniORB4</name>
<type>shared</type>
<directory>${libs-64bits}/omniORB-4.1.7-1.el6.x86_64/usr/lib64</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<!-- omniDynamic4 (1.6) 64 -->
<!-- omniDynamic4 64 -->
<name>omniDynamic4</name>
<type>shared</type>
<directory>${libs-64bits}/omniORB-4.1.7-1.el6.x86_64/usr/lib64</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<!-- COS4 (1.6) 64 -->
<!-- COS4 64 -->
<name>COS4</name>
<type>shared</type>
<directory>${libs-64bits}/omniORB-4.1.7-1.el6.x86_64/usr/lib64</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<!-- omniCodeSets4 (3.4) 64 -->
<!-- omniCodeSets4 64 -->
<name>omniCodeSets4</name>
<type>shared</type>
<directory>${libs-64bits}/omniORB-4.1.7-1.el6.x86_64/usr/lib64</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<!-- omnithread (3.4) 64 -->
<!-- omnithread 64 -->
<name>omnithread</name>
<type>shared</type>
<directory>${libs-64bits}/omniORB-4.1.7-1.el6.x86_64/usr/lib64</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<!-- zmq (3.X.Y) 64 -->
<name>zmq</name>
<type>shared</type>
<directory>${libs-64bits}/zeromq-3.2.5/lib/</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<!-- tango (8.0.5) 64 -->
<!-- tango (9.2.5) 64 -->
<name>tango</name>
<type>shared</type>
<directory>${libs-64bits}/libtango8-8.1.2-16.el6.maxlab.x86_64/usr/lib64</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
<!-- log4tango (4.0.7) 64 -->
<!-- log4tango 64 -->
<name>log4tango</name>
<type>shared</type>
<directory>${libs-64bits}/liblog4tango5-5.0.0-16.el6.maxlab.x86_64/usr/lib64</directory>
<directory>${libs-64bits}/libtango9-9.2.5-64/lib</directory>
</lib>
<lib>
......@@ -145,31 +164,31 @@
</lib>
<lib>
<!-- lz4 131 (1.7.1) 64 -->
<!-- lz4 131 64 -->
<name>lz4</name>
<type>shared</type>
<directory>${libs-64bits}/lz4-r131/lib/</directory>
</lib>
<lib>
<!-- YAT (1.13.16) 64 -->
<name>YAT-amd64-Linux-gcc-shared-release-1.17.5</name>
<!-- YAT 64 -->
<name>YAT-amd64-Linux-gcc-shared-release-${YAT.version}</name>
<type>shared</type>
<directory>${libs-64bits}/yat-1.17.5/lib</directory>
<directory>${libs-64bits}/yat-${YAT.version}/lib</directory>
</lib>
<lib>
<!-- YAT (1.10.4) 64 -->
<name>YAT4Tango-amd64-Linux-gcc-shared-release-1.12.3</name>
<!-- YAT4Tango 64 -->
<name>YAT4Tango-amd64-Linux-gcc-shared-release-${YAT4Tango.version}</name>
<type>shared</type>
<directory>${libs-64bits}/yat4tango-1.12.3/lib</directory>
<directory>${libs-64bits}/yat4tango-${YAT4Tango.version}/lib</directory>
</lib>
<lib>
<!-- NexusCPP (3.2.2) 64 -->
<name>NexusCPP-amd64-Linux-gcc-shared-release-3.3.6</name>
<!-- NexusCPP 64 -->
<name>NexusCPP-amd64-Linux-gcc-shared-release-${NexusCPP.version}</name>
<type>shared</type>
<directory>${libs-64bits}/nexuscpp-3.3.6/lib</directory>
<directory>${libs-64bits}/nexuscpp-${NexusCPP.version}/lib</directory>
</lib>
<lib>
......
src/ConfigView.cpp 100644 → 100755
+ 0
− 0
View file @ 86101c83
File mode changed from 100644 to 100755
src/DanteDpp.hpp
+ 1
− 1
View file @ 86101c83
......@@ -609,7 +609,7 @@ void DanteDpp::write_property_in_dynamic_user_attribute(yat4tango::DynamicInterf
T1 memorizedValue = yat4tango::PropertyHelper::get_property<T1>(this, property_name.c_str());
// update the attribute
attribute.set_write_value(&memorizedValue);
attribute.set_write_value(memorizedValue);
// call the write method of the dynamic attribute
(this->*in_write_method)(cbd);
......
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