summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeDetermineCCompiler.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-28 12:38:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-28 12:38:40 (GMT)
commite378bc6441331d99663048dd131c650bac8f9751 (patch)
tree3514bd914793f93e7edc9d157c556d43c9180f5f /Modules/CMakeDetermineCCompiler.cmake
parent25cfc1e38095ed3cf2c9e94f4fd4d0f9bc0a2111 (diff)
parenteeb4aece1cf564c10d1c4e7409907ca6c92462ed (diff)
downloadCMake-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/CMakeDetermineCCompiler.cmake')
-rw-r--r--Modules/CMakeDetermineCCompiler.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake
index a1713ce..9126988 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -176,12 +176,13 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
endif ()
-include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_C_ARCHITECTURE_ID)
+ include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_C_ARCHITECTURE_ID
"set(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID})")
endif()
+
# configure variables set in this file for fast reload later on
configure_file(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeCCompiler.cmake