CDPP / AMDA_Kernel

Commit 6593ba1b248cea2b05ed38f41b97e777ec11fd87

Authored by Erdogan Furkan
1 parent b1e1296b
Exists in master and in 50 other branches 10038, 10098, 5390, 7616, 9016Bis, 9084, 9326, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, cu2022, das2, density_maps, develop, evol_9042, ubuntu

Last modifications for #10038

Showing 4 changed files with 2 additions and 16 deletions   Show diff stats
Inline Side-by-side
CMakeLists.txt
  Diff comments   View file @6593ba1
1 1 cmake_minimum_required(VERSION 2.6)
2 2  
3 3 PROJECT(AMDA-Kernel)
4   -set(ENV{AMDA_COTS_DIR} "/opt")
5   -set(ENV{USERLOCAL_ROOT} "/opt/local")
6   -set(ENV{GCC_ROOT} "/usr")
7   -set(ENV{BOOST_ROOT} "/usr")
8   -set(ENV{DDSERVER_HOST_NAME} "172.200.0.10")
9   -set(ENV{DDSERVER_PORT} 5000)
10   -set(ENV{SONAR_ROOT} "/opt/tools/sonar")
11   -set(ENV{FITNESSE_ROOT} "/opt/tools/FitNesse")
12   -set(ENV{SPICE_KERNELS_DATA} "/usr/local/data/ORBITS/Kernels")
13   -set(ENV{PATH} "/usr/bin:/opt/local/bin:${PATH}")
14   -set(ENV{LD_LIBRARY_PATH} "/usr/lib64:/usr/lib:/opt/local/lib:${LD_LIBRARY_PATH}")
15   -
16 4  
17 5 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
18 6 SET(CPACK_PACKAGE_VERSION_MINOR "6")
... ...
cmake/modules/FindCon2020.cmake
  Diff comments   View file @6593ba1
1 1 FIND_PATH(CON2020INCLUDE_DIR libcon2020.h
2 2 HINTS
3   - ${USERLOCAL_ROOT}/include
  3 + ${USERLOCAL_ROOT}/include/libcon2020
4 4 NO_DEFAULT_PATH
5 5 )
6 6 mark_as_advanced(CON2020INCLUDE_DIR)
... ...
src/ExternLib/InternalField/InternalFields.hh
  Diff comments   View file @6593ba1
... ... @@ -8,7 +8,7 @@
8 8 #define INTERNALFIELDS_HH
9 9  
10 10 #include "libinternalfield.h"
11   -#include "libcon2020.h"
  11 +#include "libcon2020/libcon2020.h"
12 12  
13 13 #include "Parameter.hh"
14 14 #include "ParamData.hh"
... ...
test/FitNesseRoot/ReleaseS/SecondPart/ReLease1/SprinT2/UserStory31/content.txt
  Diff comments   View file @6593ba1
... ... @@ -72,7 +72,6 @@
72 72 !|script|TestAmdaCommandLine|
73 73 |set|${path}|path|
74 74 |note|!- Suppression des archives créées -!|
75   -
76 75 |check|execute|!- rm -!|command|-f *.zip |args|0|
77 76 |check|execute|!- rm -!|command|-f *.gz |args|0|
78 77 |check|execute|!- rm -!|command|-f *.tar |args|0|
... ... @@ -144,7 +143,6 @@
144 143 !|script|TestAmdaCommandLine|
145 144 |set|${path}|path|
146 145 |note|!- Suppression des archives créées -!|
147   -
148 146 |check|execute|!- rm -!|command|-f *.zip |args|0|
149 147 |check|execute|!- rm -!|command|-f *.gz |args|0|
150 148 |check|execute|!- rm -!|command|-f *.tar |args|0|
... ...