Merge pull request #4677 from Orphis/cmake_cleanup

Cmake cleanup

CMakeTests/CCache.cmake

@@ -0,0 +1,11 @@
+find_program(CCACHE_BIN ccache)
+if(CCACHE_BIN)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE_BIN})
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${CCACHE_BIN})
+
+    # ccache uses -I when compiling without preprocessor, which makes clang complain.
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+    endif()
+endif()

CMakeTests/CheckLib.cmake

@@ -1,8 +1,8 @@
-include(FindPkgConfig OPTIONAL)
+find_package(PkgConfig)
 
 macro(_internal_message msg)
 	if(NOT ${_is_quiet})
-		message("${msg}")
+		message(STATUS "${msg}")
 	endif()
 endmacro()
 
@@ -80,11 +80,11 @@ macro(check_libav)
 		unset(CMAKE_REQUIRED_LIBRARIES)
 	endif()
 	if(LIBAV_FOUND)
-		message("libav/ffmpeg found, enabling AVI frame dumps")
+		message(STATUS "libav/ffmpeg found, enabling AVI frame dumps")
 		add_definitions(-DHAVE_LIBAV)
 		include_directories(${LIBAV_INCLUDE_DIRS})
 	else()
-		message("libav/ffmpeg not found, disabling AVI frame dumps")
+		message(STATUS "libav/ffmpeg not found, disabling AVI frame dumps")
 	endif()
 endmacro()
 

CMakeTests/FindSFML.cmake

@@ -199,7 +199,7 @@ if (NOT SFML_FOUND)
         message(FATAL_ERROR ${FIND_SFML_ERROR})
     elseif(NOT SFML_FIND_QUIETLY)
         # error but continue
-        message("${FIND_SFML_ERROR}")
+        message(STATUS "${FIND_SFML_ERROR}")
     endif()
 endif()
 

Source/Core/DolphinWX/CMakeLists.txt

@@ -114,7 +114,7 @@ endif()
 
 set(DOLPHIN_EXE ${DOLPHIN_EXE_BASE})
 
-include(FindGettext)
+find_package(Gettext)
 if(GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND wxWidgets_FOUND)
 	file(GLOB LINGUAS ${CMAKE_SOURCE_DIR}/Languages/po/*.po)
 	add_custom_target(translations ALL)