Skip to content

Commit

Permalink
merging RELEASE branch to STABLE branch, r71932 through r72100
Browse files Browse the repository at this point in the history
svn:revision:72101
svn:branch:STABLE
svn:account:starseeker
  • Loading branch information
starseeker committed Dec 3, 2018
2 parents 3f00277 + 39b5482 commit d393b25
Show file tree
Hide file tree
Showing 63 changed files with 527 additions and 13,358 deletions.
12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2590,6 +2590,18 @@ BRLCAD_TYPE_SIZE("uint64_t" "")
BRLCAD_TYPE_SIZE("uintptr_t" "")
BRLCAD_TYPE_SIZE("sig_t" "signal.h")

# If we have an off_t that's too small, we'll need to deal with that in order to
# support large files successfully.
if (CMAKE_SIZEOF_VOID_P AND HAVE_OFF_T)
if (${CMAKE_SIZEOF_VOID_P} GREATER ${HAVE_OFF_T})
if (NOT DEFINED OFF_T_SIZE_MISMATCH)
message("Note: platform void pointer size (${CMAKE_SIZEOF_VOID_P}) is greater than off_t size (${HAVE_OFF_T})")
endif (NOT DEFINED OFF_T_SIZE_MISMATCH)
CONFIG_H_APPEND(BRLCAD "#define OFF_T_SIZE_MISMATCH 1\n")
set(OFF_T_SIZE_MISMATCH 1 CACHE INTERNAL "Have off_t that is too small for platform.")
endif (${CMAKE_SIZEOF_VOID_P} GREATER ${HAVE_OFF_T})
endif (CMAKE_SIZEOF_VOID_P AND HAVE_OFF_T)

# see if we have a TLS intrinsic, first check C++11 compliance
check_cxx_source_compiles("static thread_local int i = 0; int main() { return i; }" HAVE_THREAD_LOCAL)
if (HAVE_THREAD_LOCAL)
Expand Down
Loading

0 comments on commit d393b25

Please sign in to comment.