cmake: Fix warning on travis-ci 'CMAKE_FORCE_C.._COMPILER macro is deprecated'

CMake suggests to set CMAKE_C.._COMPILER instead and let allow CMake to
identify the compiler.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=105636
Reviewed-by: Simon McVittie <smcv@collabora.com>

diff --git a/cmake/i686-w64-mingw32.cmake b/cmake/i686-w64-mingw32.cmake
index 1be4e78c2277bec7b8cad602ce6df382e0b91910..2e09c2990d809d45baa052f7dd12f0e1c346d1f7 100644 (file)
--- a/cmake/i686-w64-mingw32.cmake
+++ b/cmake/i686-w64-mingw32.cmake
@@ -10,9 +10,8 @@ set(CMAKE_CROSSCOMPILING TRUE)
 set(WIN32 TRUE)
 set(MINGW TRUE)
 
-include(CMakeForceCompiler)
-cmake_force_c_compiler(${COMPILER_PREFIX}gcc GNU)
-cmake_force_cxx_compiler(${COMPILER_PREFIX}g++ GNU)
+set(CMAKE_C_COMPILER ${COMPILER_PREFIX}gcc)
+set(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}g++)
 set(CMAKE_RC_COMPILER ${COMPILER_PREFIX}windres)
 
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)