From c369f23686e78393f6266904db758cf14b751f44 Mon Sep 17 00:00:00 2001 From: Frank Aurich <1100101@gmail.com> Date: Tue, 26 Oct 2021 21:14:35 +0200 Subject: [PATCH] Make sure LargeFileSupport flags are set correctly after repeated calls to cmake/ccmake/cmake-gui (#2039) Co-authored-by: Mike Gelfand Co-authored-by: Charles Kerr --- cmake/LargeFileSupport.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake/LargeFileSupport.cmake b/cmake/LargeFileSupport.cmake index 01225e708..a94415beb 100644 --- a/cmake/LargeFileSupport.cmake +++ b/cmake/LargeFileSupport.cmake @@ -18,16 +18,19 @@ if(NOT DEFINED NO_LFS_MACROS_REQUIRED) if(NOT NO_LFS_MACROS_REQUIRED) if(NOT DEFINED FILE_OFFSET_BITS_LFS_MACRO_REQUIRED) check_c_source_compiles("#define _FILE_OFFSET_BITS 64 ${LFS_TEST_PROGRAM}" FILE_OFFSET_BITS_LFS_MACRO_REQUIRED) - if(FILE_OFFSET_BITS_LFS_MACRO_REQUIRED) - add_definitions(-D_FILE_OFFSET_BITS=64) - elseif(NOT DEFINED LARGE_FILES_LFS_MACRO_REQUIRED) + if(NOT FILE_OFFSET_BITS_LFS_MACRO_REQUIRED AND NOT DEFINED LARGE_FILES_LFS_MACRO_REQUIRED) check_c_source_compiles("#define _LARGE_FILES 1 ${LFS_TEST_PROGRAM}" LARGE_FILES_LFS_MACRO_REQUIRED) - if(LARGE_FILES_LFS_MACRO_REQUIRED) - add_definitions(-D_LARGE_FILES=1) - endif() endif() endif() endif() unset(LFS_TEST_PROGRAM) endif() + +if(FILE_OFFSET_BITS_LFS_MACRO_REQUIRED) + add_definitions(-D_FILE_OFFSET_BITS=64) +endif() + +if(LARGE_FILES_LFS_MACRO_REQUIRED) + add_definitions(-D_LARGE_FILES=1) +endif()