|
|
@@ -539,6 +539,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
|
|
|
else()
|
|
|
set(id_toolset "")
|
|
|
endif()
|
|
|
+ set(id_lang_version "")
|
|
|
if("x${lang}" STREQUAL "xSwift")
|
|
|
if(CMAKE_Swift_LANGUAGE_VERSION)
|
|
|
set(id_lang_version "SWIFT_VERSION = ${CMAKE_Swift_LANGUAGE_VERSION};")
|
|
|
@@ -549,8 +550,14 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
|
|
|
else()
|
|
|
set(id_lang_version "SWIFT_VERSION = 2.3;")
|
|
|
endif()
|
|
|
- else()
|
|
|
- set(id_lang_version "")
|
|
|
+ elseif("x${lang}" STREQUAL "xC" OR "x${lang}" STREQUAL "xOBJC")
|
|
|
+ if(CMAKE_${lang}_COMPILER_ID_FLAGS MATCHES "(^| )(-std=[^ ]+)( |$)")
|
|
|
+ set(id_lang_version "OTHER_CFLAGS = \"${CMAKE_MATCH_2}\";")
|
|
|
+ endif()
|
|
|
+ elseif("x${lang}" STREQUAL "xCXX" OR "x${lang}" STREQUAL "xOBJCXX")
|
|
|
+ if(CMAKE_${lang}_COMPILER_ID_FLAGS MATCHES "(^| )(-std=[^ ]+)( |$)")
|
|
|
+ set(id_lang_version "OTHER_CPLUSPLUSFLAGS = \"${CMAKE_MATCH_2}\";")
|
|
|
+ endif()
|
|
|
endif()
|
|
|
if(CMAKE_OSX_DEPLOYMENT_TARGET)
|
|
|
set(id_deployment_target
|