Merge branch 'master' into Banana

.travis.yml

@@ -49,7 +49,7 @@ before_install:
 script:
 - mkdir build
 - cd build
-- cmake .. -DWITH_QT5=On
+- cmake .. -DWITH_QT5=ON -DWITH_CCACHE=OFF
 - make -j2
 - make install
 after_success:

CMakeLists.txt

@@ -1,13 +1,6 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(MICMAC)
 
-# Configure CCache if available
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
-
 function(print_list list_name)
 	message("${list_name}:")
 	foreach(e ${${list_name}})
@@ -144,6 +137,17 @@ option(WITH_DOXYGEN "Generation de documentation" OFF )
 # Update QT translations
 option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files (WARNING: make clean will delete the source .ts files! Danger!)" OFF)
 
+option(WITH_CCACHE  "Use ccache to speed up recompilation" ON)
+
+# Configure CCache if available
+if(WITH_CCACHE)
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+endif()
+
 # fichier contenant la fonction gerant les en-tetes precompilees
 include(precompiled_headers.cmake)