diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-28 12:38:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-28 12:38:40 (GMT) |
| commit | e378bc6441331d99663048dd131c650bac8f9751 (patch) | |
| tree | 3514bd914793f93e7edc9d157c556d43c9180f5f /Modules/CMakeDetermineCXXCompiler.cmake | |
| parent | 25cfc1e38095ed3cf2c9e94f4fd4d0f9bc0a2111 (diff) | |
| parent | eeb4aece1cf564c10d1c4e7409907ca6c92462ed (diff) | |
| download | CMake-e378bc6441331d99663048dd131c650bac8f9751.zip CMake-e378bc6441331d99663048dd131c650bac8f9751.tar.gz CMake-e378bc6441331d99663048dd131c650bac8f9751.tar.bz2 | |
Merge topic 'ninja-use-deps'
eeb4aec Ninja: use deps = gcc/msvc feature
Diffstat (limited to 'Modules/CMakeDetermineCXXCompiler.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index d28aa2c..37de40d 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -175,12 +175,13 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX) endif () -include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake) include(CMakeFindBinUtils) if(MSVC_CXX_ARCHITECTURE_ID) + include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake) set(SET_MSVC_CXX_ARCHITECTURE_ID "set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID})") endif() + # configure all variables set in this file configure_file(${CMAKE_ROOT}/Modules/CMakeCXXCompiler.cmake.in ${CMAKE_PLATFORM_INFO_DIR}/CMakeCXXCompiler.cmake |