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/Platform | |
| 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/Platform')
| -rw-r--r-- | Modules/Platform/Windows-Intel.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake index 3370557..3a30a2e 100644 --- a/Modules/Platform/Windows-Intel.cmake +++ b/Modules/Platform/Windows-Intel.cmake @@ -61,7 +61,7 @@ set (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) set (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) set (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) -include("${CMAKE_PLATFORM_ROOT_BIN}/CMakeIntelInformation.cmake" OPTIONAL) +include("${CMAKE_PLATFORM_INFO_DIR}/CMakeIntelInformation.cmake" OPTIONAL) if(NOT _INTEL_XILINK_TEST_RUN) execute_process(COMMAND xilink /? @@ -70,8 +70,8 @@ if(NOT _INTEL_XILINK_TEST_RUN) if(_XILINK_HELP MATCHES MANIFEST) set(_INTEL_COMPILER_SUPPORTS_MANIFEST 1) endif() - if(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeIntelInformation.cmake") - file(WRITE ${CMAKE_PLATFORM_ROOT_BIN}/CMakeIntelInformation.cmake + if(NOT EXISTS "${CMAKE_PLATFORM_INFO_DIR}/CMakeIntelInformation.cmake") + file(WRITE ${CMAKE_PLATFORM_INFO_DIR}/CMakeIntelInformation.cmake " set(_INTEL_XILINK_TEST_RUN 1) set(_INTEL_COMPILER_SUPPORTS_MANIFEST ${_INTEL_COMPILER_SUPPORTS_MANIFEST}) |