diff --git a/Testsuite/test/collect_cgal_testresults_from_cmake b/Testsuite/test/collect_cgal_testresults_from_cmake
index 17f1471613b..d9a85b28d59 100755
--- a/Testsuite/test/collect_cgal_testresults_from_cmake
+++ b/Testsuite/test/collect_cgal_testresults_from_cmake
@@ -27,6 +27,7 @@ fi
 BUILD_LOGFILE=''
 TEST_REPORT=''
 RESULT_FILE=''
+shared_or_static='?'
 
 #print_testresult <platform> <directory>
 print_testresult()
@@ -66,7 +67,9 @@ parse_lib_building_results()
   libname=$1
   target=$2
   
-  mkdir "${libname}_${shared_or_static}"
+  if [ ! -e "${libname}_${shared_or_static}" ]; then
+    mkdir "${libname}_${shared_or_static}"
+  fi
   
   y_or_no='n'
   
@@ -77,7 +80,10 @@ parse_lib_building_results()
   marker_beg=`grep "${target}.dir/depend$" ${BUILD_LOGFILE}`
   
   if [ -n "${marker_beg}" ]; then
-    cat ${BUILD_LOGFILE} | sed -n "\|${marker_beg}|,\|depend$| p" > ${libname}_${shared_or_static}/$TEST_REPORT
+  
+    if [ ! "$target" = "CGAL" ]; then  
+      cat ${BUILD_LOGFILE} | sed -n "\|${marker_beg}|,\|depend$| p" > ${libname}_${shared_or_static}/$TEST_REPORT
+    fi
     
     # Test if there is a warning in the build log.
     if [ "$y_or_no" = "y" ]; then
@@ -93,6 +99,73 @@ parse_lib_building_results()
   echo ${libname}_${shared_or_static} $y_or_no >> $RESULT_FILE
 }
 
+output_main_logs()
+{
+  mkdir "libCGAL_${shared_or_static}"
+  
+  MAIN_LOG_REPORT="libCGAL_${shared_or_static}/$TEST_REPORT"
+  
+  echo "---------------------------------------------------------------" >  $MAIN_LOG_REPORT
+  echo "             installation.log.${CGAL_TEST_HOST}"                 >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  cat "${BUILD_LOGFILE}" >> $MAIN_LOG_REPORT
+  
+  
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo "                       CMakeCache.txt"                           >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  if [ -f "../CMakeCache.txt" ] ; then
+    cat "../CMakeCache.txt" >> $MAIN_LOG_REPORT
+  else
+    echo "Not found!" >> $MAIN_LOG_REPORT 
+  fi
+  
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo "                       CGALConfig.cmake"                         >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  if [ -f "../CGALConfig.cmake" ] ; then
+    cat "../CGALConfig.cmake" >> $MAIN_LOG_REPORT
+  else
+    echo "Not found!" >> $MAIN_LOG_REPORT 
+  fi
+  
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo "                       CMakeError.log"                           >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  if [ -f "../CMakeFiles/CMakeError.log" ] ; then
+    cat "../CMakeFiles/CMakeError.log" >> $MAIN_LOG_REPORT
+  else
+    echo "Not found!" >> $MAIN_LOG_REPORT 
+  fi
+  
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo "                       CMakeOutput.log"                          >> $MAIN_LOG_REPORT
+  echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+  echo ""                                                                >> $MAIN_LOG_REPORT
+  if [ -f "../CMakeFiles/CMakeOutput.log" ] ; then
+    cat "../CMakeFiles/CMakeOutput.log" >> $MAIN_LOG_REPORT
+  else
+    echo "Not found!" >> $MAIN_LOG_REPORT 
+  fi
+  
+  if [ -f "../setup" ] ; then
+    echo ""                                                                >> $MAIN_LOG_REPORT
+    echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+    echo "                           setup"                                >> $MAIN_LOG_REPORT
+    echo "---------------------------------------------------------------" >> $MAIN_LOG_REPORT
+    echo ""                                                                >> $MAIN_LOG_REPORT
+    cat "../setup" >> $MAIN_LOG_REPORT
+  fi
+  
+}
 
 echo "---------------------------------------------------------------"
 echo "   Collecting results of platform $CGAL_TEST_PLATFORM"
@@ -119,8 +192,10 @@ if [ -f "${BUILD_LOGFILE}" ] ; then
 
   parse_flags_and_third_party_choices
   
+  output_main_logs  
+  
   parse_lib_building_results "libCGALCore"    "CGAL_CORE"    
-  parse_lib_building_results "libCGAL"        "CGAL"         
+  parse_lib_building_results "libCGAL"        "CGAL"    
   parse_lib_building_results "libCGALimageIO" "CGAL_IMAGEIO" 
   parse_lib_building_results "libCGALPDB"     "CGAL_PDB"     
   parse_lib_building_results "libCGALQt"      "CGAL_QT"