songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a whitelist 

For now, `<CGAL/Linear_cell_complex_constructors.h>` is skipped.
This commit is contained in:
Laurent Rineau 2016-09-27 14:50:52 +02:00
parent e4d19ff0eb
commit bc03fae86c
3 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Installation/CMakeLists.txt
View File

@ -1107,6 +1107,9 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.")
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/list_of_documented_headers.cmake
OPTIONAL RESULT_VARIABLE has_list_of_documented_headers)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/list_of_whitelisted_headers.cmake
OPTIONAL RESULT_VARIABLE has_list_of_whitelisted_headers)
message("list_of_whitelisted_headers: ${list_of_whitelisted_headers}")
## Loop on package and headers
set(check_pkg_target_list)
if(POLICY CMP0057)
@ -1116,7 +1119,7 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include)
set(check_pkg_headers_depends "")
if(has_list_of_documented_headers AND POLICY CMP0057)
# Then recurse
# Then recurse2
file(GLOB_RECURSE ${package}_HEADERS
RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include"
"${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/CGAL/*.h*")
@ -1130,12 +1133,27 @@ You must disable CGAL_ENABLE_CHECK_HEADERS and CGAL_COMPUTE_DEPENDENCIES.")
set(compute_deps_extra_args "-H ")
endif()
foreach(header ${${package}_HEADERS})
if(NOT POLICY CMP0057
OR NOT has_list_of_documented_headers
OR header IN_LIST list_of_documented_headers
set(skip_hdr FALSE)
if(POLICY CMP0057
AND has_list_of_documented_headers
AND NOT header IN_LIST list_of_documented_headers
)
message(STATUS "Skip non-documented header \"${header}\".")
set(skip_hdr TRUE)
endif()
string(REGEX MATCH "CGAL/leda_.*" is_a_leda_header ${header})
if(LEDA_FOUND OR NOT is_a_leda_header)
if(NOT LEDA_FOUND AND is_a_leda_header)
message(STATUS "Skip LEDA header \"${header}\" because \
LEDA_FOUND is false.")
set(skip_hdr TRUE)
endif()
if(POLICY CMP0057
AND has_list_of_whitelisted_headers
AND header IN_LIST list_of_whitelisted_headers)
message(STATUS "Skip whitelisted header \"${header}\".")
set(skip_hdr TRUE)
endif()
if(NOT skip_hdr)
string(REPLACE "/" "__" header2 "${header}")
string(REPLACE "." "_" header2 "${header2}")
string(REPLACE ";" " " include_options_str "${include_options}")
@ -1150,7 +1168,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../${package}/include/${header}"
# depends on RS.
)
set(chk_header_name
${CGAL_BINARY_DIR}/package_info/${package}/check_headers/check_${header2})
${CGAL_BINARY_DIR}/package_info/${package}/check_headers/check_${header2})
add_custom_command(OUTPUT ${chk_header_name}
COMMAND ${CMAKE_COMMAND}
-DCERR:STRING=${chk_header_name}
@ -1165,12 +1183,6 @@ ${CGAL_BINARY_DIR}/package_info/${package}/check_headers/check_${header2})
if(${header2}_deps)
list(REMOVE_DUPLICATES ${header2}_deps)
endif()
else()
message(STATUS "Skip LEDA header \"${header}\" because \
LEDA_FOUND is false.")
endif()
else()
message(STATUS "Skip non-documented header \"${header}\".")
endif() # end the if on list_of_documented_headers
endforeach() # look on headers
add_custom_target(check_pkg_${package}_headers

2
Installation/cmake/modules/list_of_documented_headers.cmake
View File

@ -327,6 +327,8 @@ CGAL/ImageIO.h
CGAL/Implicit_mesh_domain_3.h
CGAL/Implicit_surface_3.h
CGAL/Implicit_to_labeling_function_wrapper.h
CGAL/import_from_triangulation_2.h
CGAL/import_from_triangulation_3.h
CGAL/Incremental_neighbor_search.h
CGAL/In_place_list.h
CGAL/internal/Combination_enumerator.h

5
Installation/cmake/modules/list_of_whitelisted_headers.cmake Normal file
View File

@ -0,0 +1,5 @@
set(list_of_whitelisted_headers_txt [=[
CGAL/Linear_cell_complex_constructors.h
]=])
separate_arguments(list_of_whitelisted_headers UNIX_COMMAND ${list_of_whitelisted_headers_txt})