From 31704645859b1940f7ccc92a37ed98d245e8ddf6 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 21 Mar 2018 00:06:16 +0100 Subject: [PATCH] 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 --- cmake/i686-w64-mingw32.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/i686-w64-mingw32.cmake b/cmake/i686-w64-mingw32.cmake index 1be4e78c..6b9369ba 100644 --- a/cmake/i686-w64-mingw32.cmake +++ b/cmake/i686-w64-mingw32.cmake @@ -11,8 +11,8 @@ 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) -- 2.13.6