| 123456789101112131415161718192021222324252627282930313233343536 |
- --- webkitgtk-2.16.3.orig/Source/cmake/OptionsCommon.cmake 2017-05-06 10:48:27.000000000 +0200
- +++ webkitgtk-2.16.3/Source/cmake/OptionsCommon.cmake 2017-06-06 23:50:44.794146984 +0200
- @@ -48,6 +48,33 @@ if (COMPILER_IS_CLANG AND CMAKE_GENERATO
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
- endif ()
-
- +# Ensure that the default include system directories are added to the list of CMake implicit includes.
- +# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem).
- +# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697
- +macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result)
- + file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n")
- + separate_arguments(_buildFlags UNIX_COMMAND "${_flags}")
- + execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy
- + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET
- + ERROR_VARIABLE _gccOutput)
- + file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")
- + if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list")
- + set(${_result} ${CMAKE_MATCH_1})
- + string(REPLACE "\n" " " ${_result} "${${_result}}")
- + separate_arguments(${_result})
- + endif ()
- +endmacro()
- +
- +if (CMAKE_COMPILER_IS_GNUCC)
- + DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS)
- + set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
- +endif ()
- +
- +if (CMAKE_COMPILER_IS_GNUCXX)
- + DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS)
- + set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
- +endif ()
- +
- if (WIN32 AND COMPILER_IS_GCC_OR_CLANG)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields -Wno-unknown-pragmas")
- add_definitions(-D__USE_MINGW_ANSI_STDIO=1)
|
