Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-add non testable files to test build sources

Browse Source 
The vtkm_add_header_build_test was changed to identify "valid" header
files that were actually tested and only adding those to the source
list. This was a mistake. A big part of the point of adding headers that
are not tested to the test build sources is to list them to an IDE.
This commit is contained in:
Kenneth Moreland 2018-04-19 15:31:41 -06:00
parent ffd98463f5
commit 8b9c0f50f1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMake/VTKmWrappers.cmake
View File

@ -100,7 +100,6 @@ function(vtkm_add_header_build_test name dir_prefix use_cuda)
set(ext "cu")
endif()
set(valid_hfiles )
set(srcs)
foreach (header ${hfiles})
get_source_file_property(cant_be_tested ${header} VTKm_CANT_BE_HEADER_TESTED)
@ -123,11 +122,10 @@ function(vtkm_add_header_build_test name dir_prefix use_cuda)
int ${headername}_${headerextension}_testbuild_symbol;"
)
list(APPEND srcs ${src})
list(APPEND valid_hfiles ${header})
endif()
endforeach()
set_source_files_properties(${valid_hfiles}
set_source_files_properties(${hfiles}
PROPERTIES HEADER_FILE_ONLY TRUE
)
@ -142,7 +140,7 @@ int ${headername}_${headerextension}_testbuild_symbol;"
#If the target already exists just add more sources to it
target_sources(TestBuild_${name} PRIVATE ${srcs})
else()
add_library(TestBuild_${name} STATIC ${srcs} ${valid_hfiles})
add_library(TestBuild_${name} STATIC ${srcs} ${hfiles})
# Send the libraries created for test builds to their own directory so as to
# not pollute the directory with useful libraries.
set_property(TARGET TestBuild_${name} PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${VTKm_LIBRARY_OUTPUT_PATH}/testbuilds)