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 /Tests | |
| 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 'Tests')
| -rw-r--r-- | Tests/CMakeTests/ToolchainTest.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeTests/ToolchainTest.cmake.in b/Tests/CMakeTests/ToolchainTest.cmake.in index c010fca..96e7196 100644 --- a/Tests/CMakeTests/ToolchainTest.cmake.in +++ b/Tests/CMakeTests/ToolchainTest.cmake.in @@ -6,7 +6,7 @@ macro(MARK_AS_ADVANCED) endmacro() # set this to a place where we are allowed to write -set(CMAKE_PLATFORM_ROOT_BIN "${CMAKE_CURRENT_BINARY_DIR}") +set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_CURRENT_BINARY_DIR}") # don't run the compiler detection set(CMAKE_C_COMPILER_ID_RUN 1) |