Skip to content

Commit

Permalink
COMP: Prevent CDash false positive configuring CTestCustom in extensi…
Browse files Browse the repository at this point in the history
…on build dir

It also adds "UserWarning:" as an error exception.

See AIM-Harvard/SlicerRadiomics#23 (comment)

git-svn-id: http://svn.slicer.org/Slicer4/trunk@26690 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information
jcfr committed Dec 8, 2017
1 parent 30ddf84 commit 2bec6b9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CMake/CTestCustom.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION

set(CTEST_CUSTOM_ERROR_EXCEPTION
${CTEST_CUSTOM_ERROR_EXCEPTION}
# Python
"UserWarning:"
# Python - Windows
# These warnings are interpreted as errors on Windows
"dist.py.*UserWarning.*Unknown distribution option.*"
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,8 @@ endif()
configure_file(
CMake/CTestCustom.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.cmake
@ONLY)
COPYONLY
)

#-----------------------------------------------------------------------------
# Additional CXX/C Flags
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ set(CTEST_DROP_SITE \"${CTEST_DROP_SITE}\")
set(CTEST_DROP_LOCATION \"/submit.php?project=Slicer4\")
set(CTEST_DROP_SITE_CDASH TRUE)")
endif()
message(STATUS "CTestCustom.cmake has been written to: ${ctestconfig_dest_dir}")
configure_file(
${Slicer_CMAKE_DIR}/CTestCustom.cmake.in
${ctestconfig_dest_dir}/CTestCustom.cmake
COPYONLY
)
endforeach()

set(track_qualifier_cleaned "${Slicer_EXTENSIONS_TRACK_QUALIFIER}-")
Expand Down

0 comments on commit 2bec6b9

Please sign in to comment.