Commit 06ef9b55 authored by Arafat Noureddine's avatar Arafat Noureddine Committed by Sebastien Petitdemange

Add maven HDF5 dependency

parent 10b5e7b5
...@@ -273,9 +273,4 @@ if __name__ == "__main__": ...@@ -273,9 +273,4 @@ if __name__ == "__main__":
except BuildError, e: except BuildError, e:
sys.stderr.write("!!! BUILD FAILED !!!\n") sys.stderr.write("!!! BUILD FAILED !!!\n")
# print compil errors
# for mod in module_error_list:
# print "Error in compiling : " , mod
# if target_path != None
# print "copying only
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<groupId>fr.soleil.lib</groupId> <groupId>fr.soleil.lib</groupId>
<artifactId>LimaCore-${aol}-shared-${mode}</artifactId> <artifactId>LimaCore-${aol}-shared-${mode}</artifactId>
<version>1.3.2</version> <version>1.3.3</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>LimaCore</name> <name>LimaCore</name>
...@@ -44,10 +44,18 @@ ...@@ -44,10 +44,18 @@
<groupId>fr.soleil.lib</groupId> <groupId>fr.soleil.lib</groupId>
<artifactId>YAT-${aol}-static-${mode}</artifactId> <artifactId>YAT-${aol}-static-${mode}</artifactId>
</dependency> </dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>NexusCPP-${aol}-static-${mode}</artifactId> <dependency>
</dependency> <groupId>fr.soleil.lib</groupId>
<artifactId>NexusCPP-${aol}-static-${mode}</artifactId>
</dependency>
<dependency>
<groupId>ncsa.uiuc.edu</groupId>
<artifactId>HDF5-${aol}-shared-release</artifactId>
<version>1.8.13</version>
</dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
...@@ -62,13 +70,20 @@ ...@@ -62,13 +70,20 @@
<dependency> <dependency>
<groupId>fr.soleil.lib</groupId> <groupId>fr.soleil.lib</groupId>
<artifactId>YAT-${aol}-static-${mode}</artifactId> <artifactId>YAT-${aol}-static-${mode}</artifactId>
<!--<version>1.9.3</version>-->
</dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>NexusCPP-${aol}-static-${mode}</artifactId>
<!--<version>2.2.1</version>-->
</dependency> </dependency>
<dependency>
<groupId>fr.soleil.lib</groupId>
<artifactId>NexusCPP-${aol}-shared-${mode}</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>ncsa.uiuc.edu</groupId>
<artifactId>HDF5-${aol}-shared-release</artifactId>
<version>1.8.13-vc9</version>
</dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
...@@ -87,12 +102,14 @@ ...@@ -87,12 +102,14 @@
<include>control/software_operation/src/*.cpp</include> <include>control/software_operation/src/*.cpp</include>
<include>hardware/src/*.cpp</include> <include>hardware/src/*.cpp</include>
</includes> </includes>
<includePaths> <includePaths>
<includePath>common/include</includePath> <includePath>common/include</includePath>
<includePath>control/include</includePath> <includePath>control/include</includePath>
<includePath>control/src</includePath> <includePath>control/src</includePath>
<includePath>control/software_operation/include</includePath> <includePath>control/software_operation/include</includePath>
<includePath>hardware/include</includePath> <includePath>hardware/include</includePath>
</includePaths> </includePaths>
<excludes> <excludes>
<exclude>control/src/CtSaving_Cbf.cpp</exclude> <exclude>control/src/CtSaving_Cbf.cpp</exclude>
...@@ -103,10 +120,9 @@ ...@@ -103,10 +120,9 @@
</excludes> </excludes>
<defines> <defines>
<define>WITH_NXS_SAVING</define> <define>WITH_NXS_SAVING</define>
<define>NXS_IMMEDIATE</define>
<define>NXS_COPY</define>
</defines> </defines>
</cpp> </cpp>
<libraries> <libraries>
<library> <library>
<type>shared</type> <type>shared</type>
...@@ -130,6 +146,7 @@ ...@@ -130,6 +146,7 @@
<define>_WINDOWS</define> <define>_WINDOWS</define>
<define>_USRDLL</define> <define>_USRDLL</define>
<define>_WIN32_WINNT=0x0502</define> <!-- For Windows XP Support --> <define>_WIN32_WINNT=0x0502</define> <!-- For Windows XP Support -->
</defines> </defines>
</cpp> </cpp>
</specificConfiguration> </specificConfiguration>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment