Project

General

Profile

Revision 6108b29c

Added by Roman Lebedev over 2 years ago

Revert "Merge remote-tracking branch 'upstream/pr/1542'"

Fixes #11754.

This reverts commit 8b11bad94c9237e83894c3dca781f37d79653a57, reversing
changes made to 5c801e63667838278cccfe3ebdf79eb8153bb1de.

View differences:

cmake/modules/CheckCCompilerFlagAndEnableIt.cmake
1 1
include(CheckCCompilerFlag)
2 2

  
3 3
macro (CHECK_C_COMPILER_FLAG_AND_ENABLE_IT _FLAG)
4
  string(TOUPPER "${_FLAG}" _RESULT)
5
  string(REPLACE "-" "_" _RESULT "${_RESULT}")
6
  string(REPLACE "=" "_" _RESULT "${_RESULT}")
7
  set(_RESULT "HAVE_C_FLAG${_RESULT}")
4
  set(_RESULT "C_COMPILER_UNDERSTANDS_${_FLAG}")
8 5

  
9 6
  set(CMAKE_REQUIRED_FLAGS_ORIG "${CMAKE_REQUIRED_FLAGS}")
10 7
  set(CMAKE_REQUIRED_FLAGS "${CMAKE_C_FLAGS}")
cmake/modules/CheckCXXCompilerFlagAndEnableIt.cmake
1 1
include(CheckCXXCompilerFlag)
2 2

  
3 3
macro (CHECK_CXX_COMPILER_FLAG_AND_ENABLE_IT _FLAG)
4
  string(TOUPPER "${_FLAG}" _RESULT)
5
  string(REPLACE "-" "_" _RESULT "${_RESULT}")
6
  string(REPLACE "=" "_" _RESULT "${_RESULT}")
7
  set(_RESULT "HAVE_CXX_FLAG${_RESULT}")
4
  set(_RESULT "CXX_COMPILER_UNDERSTANDS_${_FLAG}")
8 5

  
9 6
  set(CMAKE_REQUIRED_FLAGS_ORIG "${CMAKE_REQUIRED_FLAGS}")
10 7
  set(CMAKE_REQUIRED_FLAGS "${CMAKE_CXX_FLAGS}")

Also available in: Unified diff

Go to top