Commit fb64e17eb72dbedbd1032ebb12df7b87bdcd3050
1 parent
96e26914
Exists in
master
and in
98 other branches
Add script to run sonar + Fix CSlim lib detection
Showing
3 changed files
with
11 additions
and
3 deletions
Show diff stats
CMakeLists.txt
@@ -27,7 +27,7 @@ if (EXISTS "$ENV{AMDA_COTS_DIR}") | @@ -27,7 +27,7 @@ if (EXISTS "$ENV{AMDA_COTS_DIR}") | ||
27 | set(GCC_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/rtf") | 27 | set(GCC_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/rtf") |
28 | set(BOOST_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/boost") | 28 | set(BOOST_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/boost") |
29 | set(SONAR_ROOT "$ENV{AMDA_COTS_DIR}/tools/sonar") | 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 | else() | 31 | else() |
32 | message(FATAL_ERROR "AMDA_COTS_DIR NOT exists") | 32 | message(FATAL_ERROR "AMDA_COTS_DIR NOT exists") |
33 | endif() | 33 | endif() |
cmake/modules/FindCSlim.cmake
@@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
7 | 7 | ||
8 | find_path(CSLIMINCLUDE_DIR CSlim/Slim.h | 8 | find_path(CSLIMINCLUDE_DIR CSlim/Slim.h |
9 | HINTS | 9 | HINTS |
10 | - ${USERLOCAL_ROOT}/FitNesse/CSlim/include | 10 | + ${AMDA_TOOLS_DIR}/FitNesse/CSlim/include |
11 | NO_DEFAULT_PATH | 11 | NO_DEFAULT_PATH |
12 | ) | 12 | ) |
13 | mark_as_advanced(CSLIMINCLUDE_DIR) | 13 | mark_as_advanced(CSLIMINCLUDE_DIR) |
@@ -15,7 +15,7 @@ mark_as_advanced(CSLIMINCLUDE_DIR) | @@ -15,7 +15,7 @@ mark_as_advanced(CSLIMINCLUDE_DIR) | ||
15 | find_library(CSLIMLIBRARY | 15 | find_library(CSLIMLIBRARY |
16 | NAMES CSlim | 16 | NAMES CSlim |
17 | HINTS | 17 | HINTS |
18 | - ${USERLOCAL_ROOT}/FitNesse/CSlim/lib | 18 | + ${AMDA_TOOLS_DIR}/FitNesse/CSlim/lib |
19 | NO_DEFAULT_PATH | 19 | NO_DEFAULT_PATH |
20 | ) | 20 | ) |
21 | mark_as_advanced(CSLIMLIBRARY) | 21 | mark_as_advanced(CSLIMLIBRARY) |