From: jean-pierre roux Date: Thu, 8 Jan 2009 12:15:08 +0000 (+0000) Subject: Cosmetics X-Git-Tag: CREATOOLS.2-0-3~99 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=cc5a91a13ae0b597e16029eecf2f64d1c54bef9c;p=creaToolsTools.git Cosmetics --- diff --git a/ctest/README.txt b/ctest/README.txt index 3c6697c..be5eb6f 100644 --- a/ctest/README.txt +++ b/ctest/README.txt @@ -22,7 +22,7 @@ of the 'creatools', test it and submit results to creatis dashboard. your system/install specific options (libraries paths, options, build type, ...) c) Copy the file 'CMakeCache.txt' from the build tree to your testing directory (where you will run ctest, usually the same than CTEST_DASHBOARD_ROOT), - giving it a meaningfull name + and rename it with a meaningfull name like : (PROJECT-BUILDTYPE-CMakeCache.txt, e.g. crea-debug-CMakeCache.txt) d) Edit the copied file and comment out (type an initial #) all lines which make explicit reference to the build directory @@ -37,12 +37,10 @@ of the 'creatools', test it and submit results to creatis dashboard. #//Start directory with the top level CMakeLists.txt file for this #// project #CMAKE_HOME_DIRECTORY:INTERNAL=/home/guigues/coding/CreaTools/crea - - + 2) Copy in CTEST_DASHBOARD_ROOT the right ctest file to another filename, e.g. copy 'crea-linux.ctest' to 'crea-mymachine-debug.ctest' - 3) Edit the new file and set : * The architecture description, typically os+compiler with versions e.g. fc9-gcc4.3.0, win32-vs8, etc. diff --git a/ctest/bbtk-linux.ctest b/ctest/bbtk-linux.ctest index 92a9bd4..f779a11 100644 --- a/ctest/bbtk-linux.ctest +++ b/ctest/bbtk-linux.ctest @@ -10,20 +10,26 @@ cmake_minimum_required(VERSION 2.6) ################################################################# ## MANDATORY -set(arch "fc9") +## You MUST modify the following lines, according to what you use. +set(arch "fc9-gcc4.1.2") set(buildtype "debug") set(CMakeCacheFile "bbtk-debug-CMakeCache.txt") ################################################################# ################################################################# -## CAN BE CHANGED : +## MAY BE CHANGED : set(CTEST_DASHBOARD_ROOT "$ENV{HOME}/dashboards") set(MODEL Experimental) set(NUMBER_OF_CPU 2) ################################################################# ################################################################# -# NOTHING FOR USER BELOW +## The following lines must NOT be modified! +## NOTHING FOR USER BELOW +## NO RATS ALLOWED! +## HANDS OFF! +## ;-) + set(project_name "bbtk") set(CTEST_SITE "$ENV{HOSTNAME}") diff --git a/ctest/bbtk-osx.ctest b/ctest/bbtk-osx.ctest index 889b4c5..067490c 100644 --- a/ctest/bbtk-osx.ctest +++ b/ctest/bbtk-osx.ctest @@ -12,7 +12,8 @@ cmake_minimum_required(VERSION 2.6) ## MANDATORY # On my machine $ENV{HOSTNAME} does not work. why ? # Have to set the host name manually -set(CTEST_SITE "cercocebe") + +set(CTEST_SITE "cercocebe") #$ENV{HOSTNAME}") set(arch "osx_10.5.6") set(buildtype "debug") @@ -20,16 +21,22 @@ set(CMakeCacheFile "bbtk-debug-CMakeCache.txt") ################################################################# ################################################################# -## CAN BE CHANGED : +## MAY BE CHANGED : set(CTEST_DASHBOARD_ROOT "$ENV{HOME}/dashboards") set(MODEL Experimental) set(NUMBER_OF_CPU 2) ################################################################# ################################################################# -# NOTHING FOR USER BELOW +## The following lines must NOT be modified! +## NOTHING FOR USER BELOW +## NO RATS ALLOWED! +## HANDS OFF! +## ;-) + set(project_name "bbtk") +set(project_name "bbtk") set(CTEST_SITE "cercocebe") #set(CTEST_SITE "$ENV{HOSTNAME}") set(CTEST_BUILD_NAME "${project_name}-${CTEST_SITE}-${arch}-${buildtype}") diff --git a/ctest/crea-linux.ctest b/ctest/crea-linux.ctest index 5137e91..a045eba 100644 --- a/ctest/crea-linux.ctest +++ b/ctest/crea-linux.ctest @@ -11,6 +11,7 @@ cmake_minimum_required(VERSION 2.6) ################################################################# ## MANDATORY ## You MUST modify the following lines, according to what you use. + set(arch "fc9-gcc4.1.2") set(buildtype "debug") set(CMakeCacheFile "crea-debug-CMakeCache.txt") @@ -29,7 +30,7 @@ set(NUMBER_OF_CPU 2) ## NO RATS ALLOWED! ## HANDS OFF! ## ;-) - + set(project_name "crea") set(CTEST_SITE "$ENV{HOSTNAME}") diff --git a/ctest/crea-osx.ctest b/ctest/crea-osx.ctest index 202539b..b4ab463 100644 --- a/ctest/crea-osx.ctest +++ b/ctest/crea-osx.ctest @@ -11,7 +11,8 @@ cmake_minimum_required(VERSION 2.6) ## MANDATORY # On my machine $ENV{HOSTNAME} does not work. why ? # Have to set the host name manually -set(CTEST_SITE "cercocebe") + +set(CTEST_SITE "cercocebe") #$ENV{HOSTNAME}") set(arch "osx_10.5.6") set(buildtype "debug") @@ -19,16 +20,20 @@ set(CMakeCacheFile "crea-debug-CMakeCache.txt") ################################################################# ################################################################# -## CAN BE CHANGED : +## MAY BE CHANGED : set(CTEST_DASHBOARD_ROOT "$ENV{HOME}/dashboards") set(MODEL Experimental) set(NUMBER_OF_CPU 2) ################################################################# ################################################################# -# NOTHING FOR USER BELOW -set(project_name "crea") +## The following lines must NOT be modified! +## NOTHING FOR USER BELOW +## NO RATS ALLOWED! +## HANDS OFF! +## ;-) +set(project_name "crea") set(CTEST_BUILD_NAME "${project_name}-${CTEST_SITE}-${arch}-${buildtype}")