diff options
author | Brad King <brad.king@kitware.com> | 2015-11-18 15:15:25 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-18 15:15:25 (GMT) |
commit | c1cdf60a005ce1d9973fa7a3c7481ccab7b47e02 (patch) | |
tree | c34dfc2626fea0250e0efb9a83afef35b980b139 /Modules | |
parent | 4c66a9011baf3c7b42c3b7fa613ce7883a8069d6 (diff) | |
parent | c3dc8935ee5fe9415d37ec138b6c087f85f15d43 (diff) | |
download | CMake-c1cdf60a005ce1d9973fa7a3c7481ccab7b47e02.zip CMake-c1cdf60a005ce1d9973fa7a3c7481ccab7b47e02.tar.gz CMake-c1cdf60a005ce1d9973fa7a3c7481ccab7b47e02.tar.bz2 |
Merge topic 'fix-compute-default-dialect-lto'
c3dc8935 Make C and C++ default dialect detection robust to advanced optimizations
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CMakeCCompilerId.c.in | 1 | ||||
-rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Modules/CMakeCCompilerId.c.in b/Modules/CMakeCCompilerId.c.in index b224007..63f8787 100644 --- a/Modules/CMakeCCompilerId.c.in +++ b/Modules/CMakeCCompilerId.c.in @@ -55,6 +55,7 @@ int main(int argc, char* argv[]) #ifdef SIMULATE_VERSION_MAJOR require += info_simulate_version[argc]; #endif + require += info_language_dialect_default[argc]; (void)argv; return require; } diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index d467507..61cd790 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -49,6 +49,7 @@ int main(int argc, char* argv[]) #ifdef SIMULATE_VERSION_MAJOR require += info_simulate_version[argc]; #endif + require += info_language_dialect_default[argc]; (void)argv; return require; } |