Revision: 75741
http://sourceforge.net/p/brlcad/code/75741
Author: starseeker
Date: 2020-05-07 20:47:02 +0000 (Thu, 07 May 2020)
Log Message:
-----------
Test the non-generated headers. The generated headers will be trickier
Modified Paths:
--------------
brlcad/branches/bioh/include/CMakeLists.txt
brlcad/branches/bioh/include/analyze/CMakeLists.txt
brlcad/branches/bioh/include/bg/CMakeLists.txt
brlcad/branches/bioh/include/bn/CMakeLists.txt
brlcad/branches/bioh/include/brep/CMakeLists.txt
brlcad/branches/bioh/include/bu/CMakeLists.txt
brlcad/branches/bioh/include/dm/CMakeLists.txt
brlcad/branches/bioh/include/fb/CMakeLists.txt
brlcad/branches/bioh/include/gcv/CMakeLists.txt
brlcad/branches/bioh/include/ged/CMakeLists.txt
brlcad/branches/bioh/include/icv/CMakeLists.txt
brlcad/branches/bioh/include/nmg/CMakeLists.txt
brlcad/branches/bioh/include/optical/CMakeLists.txt
brlcad/branches/bioh/include/rt/CMakeLists.txt
brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
Modified: brlcad/branches/bioh/include/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/CMakeLists.txt 2020-05-07 20:33:25 UTC (rev
75740)
+++ brlcad/branches/bioh/include/CMakeLists.txt 2020-05-07 20:47:02 UTC (rev
75741)
@@ -48,7 +48,7 @@
)
BRLCAD_MANAGE_FILES("${public_hdrs}" ${INCLUDE_DIR}/brlcad)
-BRLCAD_CHECK_HDR(analyze/density.h)
+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/analyze/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/analyze/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/analyze/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -13,6 +13,9 @@
worker.h
)
BRLCAD_MANAGE_FILES(analyze_headers ${INCLUDE_DIR}/brlcad/analyze)
+
+BRLCAD_CHECK_HDRS(analyze_headers)
+
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/bioh/include/bg/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/bg/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/bg/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -13,6 +13,8 @@
)
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-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/bn/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -30,6 +30,8 @@
)
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/brep/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/brep/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/brep/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -13,6 +13,9 @@
util.h
)
BRLCAD_MANAGE_FILES(brep_headers ${INCLUDE_DIR}/brlcad/brep)
+
+BRLCAD_CHECK_HDRS(brep_headers)
+
CMAKEFILES(CMakeLists.txt)
CMAKEFILES(cdt2.h)
Modified: brlcad/branches/bioh/include/bu/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/bu/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/bu/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -46,6 +46,9 @@
vls.h
)
BRLCAD_MANAGE_FILES(bu_headers ${INCLUDE_DIR}/brlcad/bu)
+
+BRLCAD_CHECK_HDRS(bu_headers)
+
CMAKEFILES(CMakeLists.txt)
CMAKEFILES(column.h)
CMAKEFILES(tbl.h)
Modified: brlcad/branches/bioh/include/dm/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/dm/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/dm/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -5,6 +5,8 @@
)
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-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/fb/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -6,6 +6,8 @@
fb_X.h
)
+BRLCAD_CHECK_HDRS(fb_headers)
+
CMAKEFILES(${fb_noinstall_headers})
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/branches/bioh/include/gcv/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/gcv/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/gcv/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -4,6 +4,9 @@
util.h
)
BRLCAD_MANAGE_FILES(gcv_headers ${INCLUDE_DIR}/brlcad/gcv)
+
+BRLCAD_CHECK_HDRS(gcv_headers)
+
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/bioh/include/ged/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/ged/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/ged/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -12,6 +12,9 @@
view.h
)
BRLCAD_MANAGE_FILES(ged_headers ${INCLUDE_DIR}/brlcad/ged)
+
+BRLCAD_CHECK_HDRS(ged_headers)
+
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/bioh/include/icv/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/icv/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/icv/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -8,6 +8,9 @@
stat.h
)
BRLCAD_MANAGE_FILES(icv_headers ${INCLUDE_DIR}/brlcad/icv)
+
+BRLCAD_CHECK_HDRS(icv_headers)
+
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/bioh/include/nmg/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/nmg/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/nmg/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -2,6 +2,9 @@
debug.h
)
BRLCAD_MANAGE_FILES(nmg_headers ${INCLUDE_DIR}/brlcad/nmg)
+
+BRLCAD_CHECK_HDRS(nmg_headers)
+
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/bioh/include/optical/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/optical/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/optical/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -7,6 +7,9 @@
shadefuncs.h
)
BRLCAD_MANAGE_FILES(optical_headers ${INCLUDE_DIR}/brlcad/optical)
+
+BRLCAD_CHECK_HDRS(optical_headers)
+
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/branches/bioh/include/rt/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/include/rt/CMakeLists.txt 2020-05-07 20:33:25 UTC
(rev 75740)
+++ brlcad/branches/bioh/include/rt/CMakeLists.txt 2020-05-07 20:47:02 UTC
(rev 75741)
@@ -12,7 +12,6 @@
db4.h
db5.h
db_attr.h
- db_attr.h
db_diff.h
db_fullpath.h
db_instance.h
@@ -61,6 +60,9 @@
xray.h
)
BRLCAD_MANAGE_FILES(rt_headers ${INCLUDE_DIR}/brlcad/rt)
+
+BRLCAD_CHECK_HDRS(rt_headers)
+
CMAKEFILES(CMakeLists.txt)
CMAKEFILES(db_fp.h)
Modified: brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-07
20:33:25 UTC (rev 75740)
+++ brlcad/branches/bioh/misc/CMake/BRLCAD_Targets.cmake 2020-05-07
20:47:02 UTC (rev 75741)
@@ -536,8 +536,10 @@
endfunction(BRLCAD_ADDLIB libname srcslist libslist)
#-----------------------------------------------------------------------------
-# Compile test for an isolated header file
-function(BRLCAD_CHECK_HDR hdrfile)
+# Compile test for isolated header files, to check that they are self contained
+add_custom_target(check-headers ALL)
+set_target_properties(check-headers PROPERTIES FOLDER "BRL-CAD Header Checks")
+function(BRLCAD_CHECK_HDRS hdrfiles)
if (MSVC)
# Don't know how to do this on Windows
@@ -544,21 +546,29 @@
return()
endif()
- string(REPLACE "-" "_" STMPFILE "${hdrfile}")
- string(REPLACE "." "_" STMPFILE "${STMPFILE}")
- string(REPLACE "/" "_" STMPFILE "${STMPFILE}")
+ get_filename_component(SRCDIR "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
- 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")
+ 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}})
+
endfunction()
#-----------------------------------------------------------------------------
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
