Skip to content

Update CTest driver for 2.0 #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
blowekamp wants to merge 2 commits into from
Closed

Update CTest driver for 2.0 #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e22095
Use distcc only if DISTCC_DIR is defined.
blowekamp Aug 30, 2017
808c658
Optionally add CircleCI 1.0 and/or 2.0 configuration files.
blowekamp Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions circleci.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ endfunction()

set(CTEST_SITE "CircleCI")
set(CTEST_UPDATE_VERSION_ONLY 1)
set( CTEST_TEST_ARGS ${CTEST_TEST_ARGS} PARALLEL_LEVEL 2 )

set_from_env(PARALLEL_LEVEL "PARALLEL_LEVEL" DEFAULT 2 )
set( CTEST_TEST_ARGS ${CTEST_TEST_ARGS} PARALLEL_LEVEL ${PARALLEL_LEVEL})


# Make environment variables to CMake variables for CTest
Expand All @@ -46,9 +48,18 @@ set_from_env(dashboard_git_branch "CIRCLE_BRANCH")
set_from_env(dashboard_model "DASHBOARD_MODEL" DEFAULT "Continuous" )
set(dashboard_loop 0)

list(APPEND CTEST_NOTES_FILES
"${CTEST_SOURCE_DIRECTORY}/circle.yml"
)
if ( EXISTS "${CTEST_SOURCE_DIRECTORY}/circle.yml")
list(APPEND CTEST_NOTES_FILES
"${CTEST_SOURCE_DIRECTORY}/circle.yml"
)
endif()

if ( EXISTS "${CTEST_SOURCE_DIRECTORY}/.circleci/config.yml")
list(APPEND CTEST_NOTES_FILES
"${CTEST_SOURCE_DIRECTORY}/.circleci/config.yml"
)
endif()


SET (dashboard_cache "
BUILD_DOCUMENTATION:BOOL=OFF
Expand All @@ -57,9 +68,16 @@ SET (dashboard_cache "
BUILD_TESTING:BOOL=ON
ITK_USE_KWSTYLE:BOOL=OFF
ITK_BUILD_DEFAULT_MODULES:BOOL=ON
" )


if (DEFINED ENV{DISTCC_DIR})
SET (dashboard_cache "${dashboard_cache}
CMAKE_CXX_COMPILER_LAUNCHER:STRING=distcc
CMAKE_C_COMPILER_LAUNCHER:STRING=distcc
" )
")
endif()



include("${CTEST_SCRIPT_DIRECTORY}/itk_common.cmake")