diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-23 13:04:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-23 13:04:41 (GMT) |
| commit | 9fd1f5494f3650cddf949335ed3cfdfe10e0f984 (patch) | |
| tree | d2b62ef20cb0c41b5187a2f942806a4d7966d09e /Modules | |
| parent | 46098b0676383590691137acd73defba848a318d (diff) | |
| parent | 22926dd6512ca817ea2d1f2f79d4f06a6c0da618 (diff) | |
| download | CMake-9fd1f5494f3650cddf949335ed3cfdfe10e0f984.zip CMake-9fd1f5494f3650cddf949335ed3cfdfe10e0f984.tar.gz CMake-9fd1f5494f3650cddf949335ed3cfdfe10e0f984.tar.bz2 | |
Merge topic 'allow-empty-CMAKE_TOOLCHAIN_FILE'
22926dd6 Allow CMAKE_TOOLCHAIN_FILE to be an empty string
Diffstat (limited to 'Modules')
| -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 fe292ea..fa14641 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -179,7 +179,7 @@ if(CMAKE_BINARY_DIR) # if a toolchain file is used, it needs to be included in the configured file, # so settings done there are also available if they don't go in the cache and in try_compile() set(INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED) - if(DEFINED CMAKE_TOOLCHAIN_FILE) + if(CMAKE_TOOLCHAIN_FILE) set(INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED "include(\"${CMAKE_TOOLCHAIN_FILE}\")") endif() |