Revision: 75745
http://sourceforge.net/p/brlcad/code/75745
Author: starseeker
Date: 2020-05-07 21:40:16 +0000 (Thu, 07 May 2020)
Log Message:
-----------
Consolidate to one definition of the check-headers targets in include
Modified Paths:
--------------
brlcad/trunk/include/CMakeLists.txt
brlcad/trunk/include/analyze/CMakeLists.txt
brlcad/trunk/include/bg/CMakeLists.txt
brlcad/trunk/include/bn/CMakeLists.txt
brlcad/trunk/include/brep/CMakeLists.txt
brlcad/trunk/include/bu/CMakeLists.txt
brlcad/trunk/include/dm/CMakeLists.txt
brlcad/trunk/include/fb/CMakeLists.txt
brlcad/trunk/include/gcv/CMakeLists.txt
brlcad/trunk/include/ged/CMakeLists.txt
brlcad/trunk/include/icv/CMakeLists.txt
brlcad/trunk/include/nmg/CMakeLists.txt
brlcad/trunk/include/optical/CMakeLists.txt
brlcad/trunk/include/rt/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
Modified: brlcad/trunk/include/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev 75744)
+++ brlcad/trunk/include/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev 75745)
@@ -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)
@@ -71,6 +69,44 @@
)
CMAKEFILES(${include_misc})
+# Header checking target - this compiles the headers as isolated files to
+# ensure they include what is needed to resolve any symbols defined in the
+# public API.
+
+# Note: don't know how to do this on Windows - skip with Visual Studio
+if (DEFINED BRLCAD_HDR_CHECK AND NOT MSVC)
+
+ add_custom_target(check-headers ALL)
+ set_target_properties(check-headers PROPERTIES FOLDER "BRL-CAD Header
Checks")
+
+ file(GLOB_RECURSE hdrfiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
+
+ foreach(hdrfile ${hdrfiles})
+
+ string(REPLACE "-" "_" STMPFILE "${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_BINARY_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 AND NOT MSVC)
+
+
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/include/analyze/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/analyze/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/analyze/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -14,8 +14,6 @@
)
BRLCAD_MANAGE_FILES(analyze_headers ${INCLUDE_DIR}/brlcad/analyze)
-BRLCAD_CHECK_HDRS(analyze_headers)
-
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/trunk/include/bg/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/bg/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/bg/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -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/trunk/include/bn/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/bn/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/bn/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -30,8 +30,6 @@
)
BRLCAD_MANAGE_FILES(bn_headers ${INCLUDE_DIR}/brlcad/bn)
-BRLCAD_CHECK_HDRS(bn_headers)
-
CMAKEFILES(numgen.h)
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/include/brep/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/brep/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/brep/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -14,8 +14,6 @@
)
BRLCAD_MANAGE_FILES(brep_headers ${INCLUDE_DIR}/brlcad/brep)
-BRLCAD_CHECK_HDRS(brep_headers)
-
CMAKEFILES(CMakeLists.txt)
CMAKEFILES(cdt2.h)
Modified: brlcad/trunk/include/bu/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/bu/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/bu/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -47,8 +47,6 @@
)
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/trunk/include/dm/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/dm/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/dm/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -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/trunk/include/fb/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/fb/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/fb/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -6,8 +6,6 @@
fb_X.h
)
-BRLCAD_CHECK_HDRS(fb_headers)
-
CMAKEFILES(${fb_noinstall_headers})
CMAKEFILES(CMakeLists.txt)
Modified: brlcad/trunk/include/gcv/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/gcv/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/gcv/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -5,8 +5,6 @@
)
BRLCAD_MANAGE_FILES(gcv_headers ${INCLUDE_DIR}/brlcad/gcv)
-BRLCAD_CHECK_HDRS(gcv_headers)
-
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/trunk/include/ged/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/ged/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/ged/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -13,8 +13,6 @@
)
BRLCAD_MANAGE_FILES(ged_headers ${INCLUDE_DIR}/brlcad/ged)
-BRLCAD_CHECK_HDRS(ged_headers)
-
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/trunk/include/icv/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/icv/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/icv/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -9,8 +9,6 @@
)
BRLCAD_MANAGE_FILES(icv_headers ${INCLUDE_DIR}/brlcad/icv)
-BRLCAD_CHECK_HDRS(icv_headers)
-
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/trunk/include/nmg/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/nmg/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/nmg/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -3,8 +3,6 @@
)
BRLCAD_MANAGE_FILES(nmg_headers ${INCLUDE_DIR}/brlcad/nmg)
-BRLCAD_CHECK_HDRS(nmg_headers)
-
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/trunk/include/optical/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/optical/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/optical/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -8,8 +8,6 @@
)
BRLCAD_MANAGE_FILES(optical_headers ${INCLUDE_DIR}/brlcad/optical)
-BRLCAD_CHECK_HDRS(optical_headers)
-
CMAKEFILES(CMakeLists.txt)
# Local Variables:
Modified: brlcad/trunk/include/rt/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/rt/CMakeLists.txt 2020-05-07 20:59:04 UTC (rev
75744)
+++ brlcad/trunk/include/rt/CMakeLists.txt 2020-05-07 21:40:16 UTC (rev
75745)
@@ -61,8 +61,6 @@
)
BRLCAD_MANAGE_FILES(rt_headers ${INCLUDE_DIR}/brlcad/rt)
-BRLCAD_CHECK_HDRS(rt_headers)
-
CMAKEFILES(CMakeLists.txt)
CMAKEFILES(db_fp.h)
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-07 20:59:04 UTC
(rev 75744)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-07 21:40:16 UTC
(rev 75745)
@@ -536,48 +536,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_BINARY_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
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
