CDPP / AMDA_Kernel

Commit fb64e17eb72dbedbd1032ebb12df7b87bdcd3050

Authored by Benjamin Renard
1 parent 96e26914
Exists in master and in 98 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, 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, SolarOrbiter, SpeasyGet, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, centos7, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Add script to run sonar + Fix CSlim lib detection

Showing 3 changed files with 11 additions and 3 deletions   Show diff stats
Inline Side-by-side
CMakeLists.txt
  Diff comments   View file @fb64e17
... ... @@ -27,7 +27,7 @@ if (EXISTS "$ENV{AMDA_COTS_DIR}")
27 27 set(GCC_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/rtf")
28 28 set(BOOST_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/boost")
29 29 set(SONAR_ROOT "$ENV{AMDA_COTS_DIR}/tools/sonar")
30   - set(FITNESSE_ROOT "$ENV{AMDA_COTS_DIR}/tools/fitnesse")
  30 + set(FITNESSE_ROOT "$ENV{AMDA_COTS_DIR}/tools/FitNesse")
31 31 else()
32 32 message(FATAL_ERROR "AMDA_COTS_DIR NOT exists")
33 33 endif()
... ...
cmake/modules/FindCSlim.cmake
  Diff comments   View file @fb64e17
... ... @@ -7,7 +7,7 @@
7 7  
8 8 find_path(CSLIMINCLUDE_DIR CSlim/Slim.h
9 9 HINTS
10   - ${USERLOCAL_ROOT}/FitNesse/CSlim/include
  10 + ${AMDA_TOOLS_DIR}/FitNesse/CSlim/include
11 11 NO_DEFAULT_PATH
12 12 )
13 13 mark_as_advanced(CSLIMINCLUDE_DIR)
... ... @@ -15,7 +15,7 @@ mark_as_advanced(CSLIMINCLUDE_DIR)
15 15 find_library(CSLIMLIBRARY
16 16 NAMES CSlim
17 17 HINTS
18   - ${USERLOCAL_ROOT}/FitNesse/CSlim/lib
  18 + ${AMDA_TOOLS_DIR}/FitNesse/CSlim/lib
19 19 NO_DEFAULT_PATH
20 20 )
21 21 mark_as_advanced(CSLIMLIBRARY)
... ...
script/run-sonar.sh 0 → 100755
  Diff comments   View file @fb64e17
... ... @@ -0,0 +1,8 @@
  1 +#! /bin/sh
  2 +
  3 +SCRIPT=$(readlink -f "$0")
  4 +SCRIPTDIR=$(dirname "$SCRIPT")
  5 +
  6 +. ${SCRIPTDIR}/amda-kernel-env
  7 +
  8 +sudo $SONAR_ROOT/sonar-3.2/bin/linux-x86-64/sonar.sh "$@"
... ...