Merge pull request #941 from bilke/ccache

CCache follow-up

scripts/cmake/CompilerSetup.cmake

@@ -8,13 +8,13 @@ set(CMAKE_OSX_ARCHITECTURES "x86_64")
 # Set compiler helper variables
 
 if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
-    set(COMPILER_IS_CLANG TRUE)
+    set(COMPILER_IS_CLANG TRUE CACHE BOOL "" INTERNAL)
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-    set(COMPILER_IS_GCC TRUE)
+    set(COMPILER_IS_GCC TRUE CACHE BOOL "" INTERNAL)
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
-    set(COMPILER_IS_INTEL TRUE)
+    set(COMPILER_IS_INTEL TRUE CACHE BOOL "" INTERNAL)
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-    set(COMPILER_IS_MSVC TRUE)
+    set(COMPILER_IS_MSVC TRUE CACHE BOOL "" INTERNAL)
 endif() # CMAKE_CXX_COMPILER_ID
 
 # Better Clang warning suppression, see http://www.openwalnut.org/issues/230
@@ -63,11 +63,6 @@ if(COMPILER_IS_CLANG)
 	endif()
 
 	include(ClangSanitizer)
-
-	if(CCACHE_FOUND AND APPLE)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
-	endif()
-
 endif() # COMPILER_IS_CLANG
 
 ### Intel compiler

scripts/cmake/Find.cmake

@@ -45,6 +45,16 @@ find_program(CURL_TOOL_PATH curl DOC "The curl-tool")
 
 find_program(S3CMD_TOOL_PATH s3cmd DOC "S3cmd tool for uploading to Amazon S3")
 
+## 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)
+	if(COMPILER_IS_CLANG)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
+	endif()
+endif(CCACHE_FOUND)
+
 ######################
 ### Find libraries ###
 ######################
@@ -128,10 +138,3 @@ if(OGS_USE_MPI)
 	find_package(MPI REQUIRED)
 	include_directories(SYSTEM ${MPI_CXX_INCLUDE_PATH})
 endif()
-
-## 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)