diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-21 15:02:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-21 15:02:56 (GMT) |
| commit | f5e9aedb5acea8bd19c941db8eaeecc9e2233cbd (patch) | |
| tree | 5e857bc28825c2faaffc5dfbbc4501ce2e70d5c3 | |
| parent | 3dec2d1a77cdaeddf3b1bc482368e4b346f138dd (diff) | |
| parent | cc8162a98144749e5dd73fdc0fe290afe35b65bb (diff) | |
| download | CMake-f5e9aedb5acea8bd19c941db8eaeecc9e2233cbd.zip CMake-f5e9aedb5acea8bd19c941db8eaeecc9e2233cbd.tar.gz CMake-f5e9aedb5acea8bd19c941db8eaeecc9e2233cbd.tar.bz2 | |
Merge topic 'make-CMAKE_EXECUTABLE_FORMAT-internal'
cc8162a981 CMakeDetermineCompilerId: Ensure CMAKE_EXECUTABLE_FORMAT is INTERNAL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5627
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 8cf161f..d07db70 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -911,12 +911,12 @@ function(CMAKE_DETERMINE_COMPILER_ID_CHECK lang file) # # COFF (.exe) files start with "MZ" # if("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "4d5a....") -# set(CMAKE_EXECUTABLE_FORMAT "COFF" CACHE STRING "Executable file format") +# set(CMAKE_EXECUTABLE_FORMAT "COFF" CACHE INTERNAL "Executable file format") # endif() # # Mach-O files start with MH_MAGIC or MH_CIGAM if("${CMAKE_EXECUTABLE_MAGIC}" MATCHES "feedface|cefaedfe|feedfacf|cffaedfe") - set(CMAKE_EXECUTABLE_FORMAT "MACHO" CACHE STRING "Executable file format") + set(CMAKE_EXECUTABLE_FORMAT "MACHO" CACHE INTERNAL "Executable file format") endif() endif() |