Revision: 75893
http://sourceforge.net/p/brlcad/code/75893
Author: starseeker
Date: 2020-05-23 16:25:47 +0000 (Sat, 23 May 2020)
Log Message:
-----------
Make bioh branch match trunk
Modified Paths:
--------------
brlcad/branches/bioh/include/CMakeLists.txt
brlcad/branches/bioh/include/bg/CMakeLists.txt
brlcad/branches/bioh/include/bn/CMakeLists.txt
brlcad/branches/bioh/include/dm/CMakeLists.txt
brlcad/branches/bioh/include/fb/CMakeLists.txt
brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/bioh/src/libdm/fontstash/fontstash.h
Modified: brlcad/branches/bioh/include/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/CMakeLists.txt 2020-05-23 13:42:39 UTC (rev
75892)
+++ brlcad/branches/bioh/include/CMakeLists.txt 2020-05-23 16:25:47 UTC (rev
75893)
@@ -48,8 +48,6 @@
)
BRLCAD_MANAGE_FILES("${public_hdrs}" ${INCLUDE_DIR}/brlcad)
-BRLCAD_CHECK_HDRS(public_headers)
-
BUILD_CFG_HDR(brlcad_ident.h.in ${INCLUDE_DIR}/brlcad)
BUILD_CFG_HDR(brlcad_version.h.in ${INCLUDE_DIR}/brlcad)
Modified: brlcad/branches/bioh/include/bg/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/bg/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
+++ brlcad/branches/bioh/include/bg/CMakeLists.txt 2020-05-23 16:25:47 UTC
(rev 75893)
@@ -13,8 +13,6 @@
)
BRLCAD_MANAGE_FILES(bg_headers ${INCLUDE_DIR}/brlcad/bg)
-BRLCAD_CHECK_HDRS(bg_headers)
-
CMAKEFILES(pointgen.h)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/bioh/include/bn/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/bn/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
+++ brlcad/branches/bioh/include/bn/CMakeLists.txt 2020-05-23 16:25:47 UTC
(rev 75893)
@@ -28,8 +28,6 @@
)
BRLCAD_MANAGE_FILES(bn_headers ${INCLUDE_DIR}/brlcad/bn)
-BRLCAD_CHECK_HDRS(bn_headers)
-
CMAKEFILES(numgen.h)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/bioh/include/dm/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/dm/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
+++ brlcad/branches/bioh/include/dm/CMakeLists.txt 2020-05-23 16:25:47 UTC
(rev 75893)
@@ -5,8 +5,6 @@
)
BRLCAD_MANAGE_FILES(dm_headers ${INCLUDE_DIR}/brlcad/dm)
-BRLCAD_CHECK_HDRS(dm_headers)
-
CMAKEFILES(dm-design.h)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/bioh/include/fb/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/fb/CMakeLists.txt 2020-05-23 13:42:39 UTC
(rev 75892)
+++ brlcad/branches/bioh/include/fb/CMakeLists.txt 2020-05-23 16:25:47 UTC
(rev 75893)
@@ -6,8 +6,6 @@
fb_X.h
)
-BRLCAD_CHECK_HDRS(fb_headers)
-
CMAKEFILES(${fb_noinstall_headers})
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-23
13:42:39 UTC (rev 75892)
+++ brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-23
16:25:47 UTC (rev 75893)
@@ -555,47 +555,6 @@
endfunction(BRLCAD_ADDLIB libname srcslist libslist)
#-----------------------------------------------------------------------------
-# Compile test for isolated header files, to check that they are self contained
-if (DEFINED BRLCAD_HDR_CHECK)
- add_custom_target(check-headers ALL)
- set_target_properties(check-headers PROPERTIES FOLDER "BRL-CAD Header
Checks")
-endif (DEFINED BRLCAD_HDR_CHECK)
-
-function(BRLCAD_CHECK_HDRS hdrfiles)
-
- if (DEFINED BRLCAD_HDR_CHECK)
- if (MSVC)
- # Don't know how to do this on Windows
- return()
- endif()
-
- get_filename_component(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
-
- foreach(hdrfile ${${hdrfiles}})
-
- string(REPLACE "-" "_" STMPFILE "${SRCDIR}_${hdrfile}")
- string(REPLACE "." "_" STMPFILE "${STMPFILE}")
- string(REPLACE "/" "_" STMPFILE "${STMPFILE}")
-
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${STMPFILE}.stamp
- COMMAND ${CMAKE_CXX_COMPILER} -I${CMAKE_SOURCE_DIR}/include
-I${CMAKE_SOURCE_DIR}/src/other/openNURBS
- -I${CMAKE_SOURCE_DIR}/src/other/tcl/generic -fsyntax-only -Wall -Wextra
-Wno-deprecated
- ${CMAKE_CURRENT_SOURCE_DIR}/${hdrfile}
- COMMAND ${CMAKE_COMMAND} -E touch
${CMAKE_CURRENT_BINARY_DIR}/${hdrfile}.stamp
- DEPENDS ${hdrfile}
- )
- add_custom_target(${STMPFILE}-check DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/${STMPFILE}.stamp)
- set_target_properties(${STMPFILE}-check PROPERTIES FOLDER "BRL-CAD
Header Checks")
-
- add_dependencies(check-headers ${STMPFILE}-check)
-
- endforeach(hdrfile ${${hdrfiles}})
- endif (DEFINED BRLCAD_HDR_CHECK)
-
-endfunction()
-
-#-----------------------------------------------------------------------------
# For situations when a local 3rd party library (say, zlib) has been chosen in
# preference to a system version of that library, it is important to ensure
# that the local header(s) get included before the system headers. Normally
Modified: brlcad/branches/bioh/src/libdm/fontstash/fontstash.h
===================================================================
--- brlcad/branches/bioh/src/libdm/fontstash/fontstash.h 2020-05-23
13:42:39 UTC (rev 75892)
+++ brlcad/branches/bioh/src/libdm/fontstash/fontstash.h 2020-05-23
16:25:47 UTC (rev 75893)
@@ -884,9 +884,9 @@
// Read in the font data.
fp = fopen(path, "rb");
if (fp == NULL) goto error;
- bu_fseek(fp,0,SEEK_END);
- dataSize = (int)bu_ftell(fp);
- bu_fseek(fp,0,SEEK_SET);
+ fseek(fp,0,SEEK_END);
+ dataSize = (int)ftell(fp);
+ fseek(fp,0,SEEK_SET);
data = (unsigned char*)malloc(dataSize);
if (data == NULL) goto error;
if (!fread(data, 1, dataSize, fp)) goto error;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
