From 7f891b7134e73e7e5182d130b80bbde93d483b69 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sat, 27 Nov 2021 07:18:49 +0000 Subject: [PATCH] mingw(64).cmake: Remove `cmake_minimum_required` Our cmake_minimum_required is already at 3.13 --- CMake/mingwcc.cmake | 48 +++++++++++++++++++++---------------------- CMake/mingwcc64.cmake | 46 ++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/CMake/mingwcc.cmake b/CMake/mingwcc.cmake index 7be2bc970..535c82c9b 100644 --- a/CMake/mingwcc.cmake +++ b/CMake/mingwcc.cmake @@ -1,25 +1,23 @@ -cmake_minimum_required(VERSION 3.10) - -SET(MINGW_CROSS TRUE) - -SET(CROSS_PREFIX "/usr" CACHE STRING "crosstool-NG prefix") - -SET(CMAKE_SYSTEM_NAME Windows) - -# workaround -list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${CROSS_PREFIX}/i686-w64-mingw32/include") - -SET(CMAKE_C_COMPILER "i686-w64-mingw32-gcc") -SET(CMAKE_CXX_COMPILER "i686-w64-mingw32-g++") -set(CMAKE_RC_COMPILER "i686-w64-mingw32-windres") -set(PKG_CONFIG_EXECUTABLE "${CROSS_PREFIX}/bin/i686-w64-mingw32-pkg-config") - -SET(CMAKE_FIND_ROOT_PATH "${CROSS_PREFIX}/i686-w64-mingw32" "${CROSS_PREFIX}/i686-w64-mingw32/i686-w64-mingw32") - -SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - -SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3) - SET(DISABLE_LTO ON) -endif() +SET(MINGW_CROSS TRUE) + +SET(CROSS_PREFIX "/usr" CACHE STRING "crosstool-NG prefix") + +SET(CMAKE_SYSTEM_NAME Windows) + +# workaround +list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${CROSS_PREFIX}/i686-w64-mingw32/include") + +SET(CMAKE_C_COMPILER "i686-w64-mingw32-gcc") +SET(CMAKE_CXX_COMPILER "i686-w64-mingw32-g++") +set(CMAKE_RC_COMPILER "i686-w64-mingw32-windres") +set(PKG_CONFIG_EXECUTABLE "${CROSS_PREFIX}/bin/i686-w64-mingw32-pkg-config") + +SET(CMAKE_FIND_ROOT_PATH "${CROSS_PREFIX}/i686-w64-mingw32" "${CROSS_PREFIX}/i686-w64-mingw32/i686-w64-mingw32") + +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3) + SET(DISABLE_LTO ON) +endif() diff --git a/CMake/mingwcc64.cmake b/CMake/mingwcc64.cmake index bfcd41094..d2e77dda7 100644 --- a/CMake/mingwcc64.cmake +++ b/CMake/mingwcc64.cmake @@ -1,24 +1,22 @@ -cmake_minimum_required(VERSION 3.10) - -SET(MINGW_CROSS TRUE) - -SET(CROSS_PREFIX "/usr" CACHE STRING "crosstool-NG prefix") - -SET(CMAKE_SYSTEM_NAME Windows) - -# workaround -list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${CROSS_PREFIX}/x86_64-w64-mingw32/include") - -SET(CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc") -SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++") -set(CMAKE_RC_COMPILER "x86_64-w64-mingw32-windres") -set(PKG_CONFIG_EXECUTABLE "${CROSS_PREFIX}/bin/x86_64-w64-mingw32-pkg-config") - -SET(CMAKE_FIND_ROOT_PATH "${CROSS_PREFIX}/x86_64-w64-mingw32" "${CROSS_PREFIX}/x86_64-w64-mingw32/x86_64-w64-mingw32") - -SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) - -SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -SET(SYSTEM_BITS x64) -SET(DISABLE_LTO ON) +SET(MINGW_CROSS TRUE) + +SET(CROSS_PREFIX "/usr" CACHE STRING "crosstool-NG prefix") + +SET(CMAKE_SYSTEM_NAME Windows) + +# workaround +list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "${CROSS_PREFIX}/x86_64-w64-mingw32/include") + +SET(CMAKE_C_COMPILER "x86_64-w64-mingw32-gcc") +SET(CMAKE_CXX_COMPILER "x86_64-w64-mingw32-g++") +set(CMAKE_RC_COMPILER "x86_64-w64-mingw32-windres") +set(PKG_CONFIG_EXECUTABLE "${CROSS_PREFIX}/bin/x86_64-w64-mingw32-pkg-config") + +SET(CMAKE_FIND_ROOT_PATH "${CROSS_PREFIX}/x86_64-w64-mingw32" "${CROSS_PREFIX}/x86_64-w64-mingw32/x86_64-w64-mingw32") + +SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +SET(SYSTEM_BITS x64) +SET(DISABLE_LTO ON)