kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'allow-empty-CMAKE_TOOLCHAIN_FILE' 

22926dd6 Allow CMAKE_TOOLCHAIN_FILE to be an empty string
This commit is contained in:
Brad King 2015-04-23 09:04:41 -04:00 committed by CMake Topic Stage
parent 46098b0676 22926dd651
commit 9fd1f5494f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/CMakeDetermineSystem.cmake
View File

@ -179,7 +179,7 @@ if(CMAKE_BINARY_DIR)
# if a toolchain file is used, it needs to be included in the configured file, # 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() # 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) 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}\")") set(INCLUDE_CMAKE_TOOLCHAIN_FILE_IF_REQUIRED "include(\"${CMAKE_TOOLCHAIN_FILE}\")")
endif() endif()