Skip to content

Commit

Permalink
OS X|CMake: Only use the override warning with AppleClang 7+
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Jun 14, 2015
1 parent f8dd238 commit 42ee250
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion doomsday/cmake/PlatformMacx.cmake
Expand Up @@ -26,7 +26,17 @@ add_definitions (
-DDENG_BASE_DIR="${CMAKE_INSTALL_PREFIX}/${DENG_INSTALL_DATA_DIR}"
)

append_unique (CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override") # too many warnings from Qt
# Check compiler version.
if (NOT DEFINED CLANG_VERSION_STRING AND ${CMAKE_CXX_COMPILER_ID} MATCHES ".*Clang.*")
execute_process (COMMAND ${CMAKE_CXX_COMPILER} --version OUTPUT_VARIABLE CLANG_VERSION_FULL)
string (REGEX REPLACE ".*version ([0-9]+\\.[0-9]+).*" "\\1" CLANG_VERSION_STRING ${CLANG_VERSION_FULL})
set (CLANG_VERSION_STRING "${CLANG_VERSION_STRING}" CACHE INTERNAL "Clang version number")
endif ()

if (${CLANG_VERSION_STRING} VERSION_EQUAL 7.0 OR
${CLANG_VERSION_STRING} VERSION_GREATER 7.0)
append_unique (CMAKE_CXX_FLAGS "-Wno-inconsistent-missing-override") # too many warnings from Qt
endif ()

set (DENG_FIXED_ASM_DEFAULT OFF)

Expand Down

0 comments on commit 42ee250

Please sign in to comment.