From fb64e17eb72dbedbd1032ebb12df7b87bdcd3050 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Wed, 4 Apr 2018 17:23:22 +0200
Subject: [PATCH] Add script to run sonar + Fix CSlim lib detection

---
 CMakeLists.txt                | 2 +-
 cmake/modules/FindCSlim.cmake | 4 ++--
 script/run-sonar.sh           | 8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100755 script/run-sonar.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3579706..3fa279d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ if (EXISTS "$ENV{AMDA_COTS_DIR}")
     set(GCC_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/rtf")
     set(BOOST_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/boost")
     set(SONAR_ROOT "$ENV{AMDA_COTS_DIR}/tools/sonar")
-    set(FITNESSE_ROOT "$ENV{AMDA_COTS_DIR}/tools/fitnesse")
+    set(FITNESSE_ROOT "$ENV{AMDA_COTS_DIR}/tools/FitNesse")
 else()
     message(FATAL_ERROR "AMDA_COTS_DIR NOT exists")
 endif()
diff --git a/cmake/modules/FindCSlim.cmake b/cmake/modules/FindCSlim.cmake
index c38b75b..8c128bf 100644
--- a/cmake/modules/FindCSlim.cmake
+++ b/cmake/modules/FindCSlim.cmake
@@ -7,7 +7,7 @@
 
 find_path(CSLIMINCLUDE_DIR CSlim/Slim.h
     HINTS
-      ${USERLOCAL_ROOT}/FitNesse/CSlim/include
+      ${AMDA_TOOLS_DIR}/FitNesse/CSlim/include
     NO_DEFAULT_PATH
 )
 mark_as_advanced(CSLIMINCLUDE_DIR)
@@ -15,7 +15,7 @@ mark_as_advanced(CSLIMINCLUDE_DIR)
 find_library(CSLIMLIBRARY 
     NAMES CSlim
     HINTS
-        ${USERLOCAL_ROOT}/FitNesse/CSlim/lib
+        ${AMDA_TOOLS_DIR}/FitNesse/CSlim/lib
     NO_DEFAULT_PATH
 )
 mark_as_advanced(CSLIMLIBRARY)
diff --git a/script/run-sonar.sh b/script/run-sonar.sh
new file mode 100755
index 0000000..f92f5fb
--- /dev/null
+++ b/script/run-sonar.sh
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTDIR=$(dirname "$SCRIPT")
+
+. ${SCRIPTDIR}/amda-kernel-env
+
+sudo $SONAR_ROOT/sonar-3.2/bin/linux-x86-64/sonar.sh "$@"
--
libgit2 0.21.2