diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-18 15:14:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-18 15:14:09 (GMT) |
| commit | daa72b253a5d07b985653c4ce1d2a7a647129e43 (patch) | |
| tree | 8023ff708eb2cd7b6586ccabb10ad022215e240e | |
| parent | 60859b93db0787f1beb421de7e61a0d79d6dfd80 (diff) | |
| parent | c3dc8935ee5fe9415d37ec138b6c087f85f15d43 (diff) | |
| download | CMake-daa72b253a5d07b985653c4ce1d2a7a647129e43.zip CMake-daa72b253a5d07b985653c4ce1d2a7a647129e43.tar.gz CMake-daa72b253a5d07b985653c4ce1d2a7a647129e43.tar.bz2 | |
Merge branch 'fix-compute-default-dialect-lto' into release
| -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; } |