diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-24 14:03:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-30 13:45:17 (GMT) |
| commit | 32b7c72623a52331e2a965c3b1569143606afffc (patch) | |
| tree | 967bd17be99751412f2a38d00dc707ced3f9025a /Modules/CMakeDetermineSystem.cmake | |
| parent | f3ddfef137f56c9660a7ad65807387987bcb2996 (diff) | |
| parent | 3df81b49126cf6dc3e4e9a8fa8c368f33886db54 (diff) | |
| download | CMake-32b7c72623a52331e2a965c3b1569143606afffc.zip CMake-32b7c72623a52331e2a965c3b1569143606afffc.tar.gz CMake-32b7c72623a52331e2a965c3b1569143606afffc.tar.bz2 | |
Merge branch 'cmake-platform-info-version' into msvc-compiler-info
Conflicts:
Modules/CMakeTestCCompiler.cmake
Modules/CMakeTestCXXCompiler.cmake
Modules/Platform/Windows-cl.cmake
Diffstat (limited to 'Modules/CMakeDetermineSystem.cmake')
| -rw-r--r-- | Modules/CMakeDetermineSystem.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index 22c5016..cd33447 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -170,7 +170,7 @@ if(CMAKE_BINARY_DIR) # configure variables set in this file for fast reload, the template file is defined at the top of this file configure_file(${CMAKE_ROOT}/Modules/CMakeSystem.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeSystem.cmake + ${CMAKE_PLATFORM_INFO_DIR}/CMakeSystem.cmake IMMEDIATE @ONLY) endif() |