Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'sha-in-system-information' into 'master'

Browse Source 
Add git SHA to information reported in SystemInformation test

See merge request !113
This commit is contained in:
Kenneth Moreland 2015-07-31 14:28:54 -04:00
commit 91ce7b12c1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMake/VTKmSystemInformation.cmake
View File

@ -25,7 +25,7 @@
# #
# This script is called with a command like: # This script is called with a command like:
# #
# cmake -D VTKm_BINARY_DIR=<top-of-build-tree> -P <this-script> # cmake -D VTKm_BINARY_DIR=<top-of-build-tree> -D VTKm_SOURCE_DIR=<top-of-source-tree> -P <this-script>
# #
set(FILES set(FILES
@ -50,8 +50,21 @@ Contents of \"${filename}\":
endif() endif()
endfunction(print_file) endfunction(print_file)
message("CTEST_FULL_OUTPUT (Avoid ctest truncation of output)") message("CTEST_FULL_OUTPUT (Avoid ctest truncation of output)")
execute_process(
COMMAND git rev-parse -q HEAD
WORKING_DIRECTORY "${VTKm_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_SHA
)
message("
==============================================================================
git SHA: ${GIT_SHA}")
foreach(filename ${FILES}) foreach(filename ${FILES})
print_file(${filename}) print_file(${filename})
endforeach() endforeach()

2
CMakeLists.txt
View File

@ -113,7 +113,7 @@ if (VTKm_ENABLE_TESTING)
COMMAND ${CMAKE_COMMAND} "-DVTKm_SOURCE_DIR=${VTKm_SOURCE_DIR}" -P "${VTKm_SOURCE_DIR}/CMake/VTKmCheckCopyright.cmake" COMMAND ${CMAKE_COMMAND} "-DVTKm_SOURCE_DIR=${VTKm_SOURCE_DIR}" -P "${VTKm_SOURCE_DIR}/CMake/VTKmCheckCopyright.cmake"
) )
add_test(NAME SystemInformation add_test(NAME SystemInformation
COMMAND ${CMAKE_COMMAND} "-DVTKm_BINARY_DIR=${VTKm_BINARY_DIR}" -P "${VTKm_SOURCE_DIR}/CMake/VTKmSystemInformation.cmake" COMMAND ${CMAKE_COMMAND} "-DVTKm_SOURCE_DIR=${VTKm_SOURCE_DIR}" "-DVTKm_BINARY_DIR=${VTKm_BINARY_DIR}" -P "${VTKm_SOURCE_DIR}/CMake/VTKmSystemInformation.cmake"
) )
endif (VTKm_ENABLE_TESTING) endif (VTKm_ENABLE_TESTING)