Skip to content

Commit d3b6475

Browse files
hjmjohnsonkwrobot
authored andcommitted
Merge topic 'UpdateToVXL2.0.0'
1f56f37 COMP: Many of the remotes require updates for ITKv5 e7db79d Merge branch 'upstream-vnl' into UpdateToVXL2.0.0 d83514c VNL 2018-11-04 (ea3a2cc9) 60c11f4 ENH: Provide mechanism for changing git remote url ff285c3 STYLE: Remove unused include headers 135f08e ENH: Update to require VXL 2.0.0 or later 0249113 BUG: Do not override user selection settings 093da0c ENH: Adding a few more clang tidy checks. d8744c0 ENH: Add scripts to assist with migrations
2 parents ec4c2a5 + 1f56f37 commit d3b6475

848 files changed

Lines changed: 4535 additions & 10763 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMake/ITKModuleRemote.cmake

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,31 @@ endfunction()
4545
# Helper to perform a git update. Checks the current Git revision against the
4646
# desired revision and only performs a fetch and checkout if needed.
4747
function(_git_update git_executable git_repository git_tag module_dir)
48+
# Verify that remote url are the same
49+
execute_process(
50+
COMMAND "${git_executable}" config --get remote.origin.url
51+
WORKING_DIRECTORY "${module_dir}"
52+
RESULT_VARIABLE error_code
53+
OUTPUT_VARIABLE remote_origin_url
54+
OUTPUT_STRIP_TRAILING_WHITESPACE
55+
)
56+
if ( NOT "${remote_origin_url}" STREQUAL "${git_repository}")
57+
message(WARNING "Remote URL changed from ${git_repository} to ${remote_origin_url}")
58+
execute_process(
59+
COMMAND "${git_executable}" remote rename origin old_origin
60+
WORKING_DIRECTORY "${module_dir}"
61+
RESULT_VARIABLE error_code
62+
OUTPUT_VARIABLE ignored
63+
OUTPUT_STRIP_TRAILING_WHITESPACE
64+
)
65+
execute_process(
66+
COMMAND "${git_executable}" remote add origin "${git_repository}"
67+
WORKING_DIRECTORY "${module_dir}"
68+
RESULT_VARIABLE error_code
69+
OUTPUT_VARIABLE ignored
70+
OUTPUT_STRIP_TRAILING_WHITESPACE
71+
)
72+
endif()
4873
execute_process(
4974
COMMAND "${git_executable}" rev-parse --verify "${git_tag}"
5075
WORKING_DIRECTORY "${module_dir}"

Examples/Segmentation/GeodesicActiveContourShapePriorLevelSetImageFilter.cxx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
#include "itkEuler2DTransform.h"
125125
#include "itkOnePlusOneEvolutionaryOptimizer.h"
126126
#include "itkNormalVariateGenerator.h"
127-
#include "vnl/vnl_sample.h"
128127
#include "itkNumericSeriesFileNames.h"
129128
// Software Guide : EndCodeSnippet
130129

Modules/Core/Transform/include/itkKernelTransform.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "vnl/vnl_vector.h"
2929
#include "vnl/vnl_vector_fixed.h"
3030
#include "vnl/algo/vnl_svd.h"
31-
#include "vnl/vnl_sample.h"
3231

3332
namespace itk
3433
{

Modules/Core/Transform/test/itkTransformsSetParametersTest.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "itkThinPlateSplineKernelTransform.h"
3636
#include "itkVolumeSplineKernelTransform.h"
3737
#include "itkIntTypes.h"
38+
#include <vnl/vnl_sample.h>
3839

3940

4041
// Generic Kernel Transform Tester
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
itk_fetch_module(AnalyzeObjectMapIO
22
"AnalyzeObjectMapIO plugin for ITK. From Insight Journal article with handle: https://hdl.handle.net/1926/593"
33
GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/itkAnalyzeObjectMap.git
4-
GIT_TAG c58f513b6e81fb0a09a712720a4a92f3ec12cf08
4+
GIT_TAG 54c3e2dbf0b4259aabe6c430df75171469d7bfee
55
)

Modules/Remote/AnisotropicDiffusionLBR.remote.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ itk_fetch_module(AnisotropicDiffusionLBR
2020
http://insight-journal.org/browse/publication/953
2121
"
2222
GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKAnisotropicDiffusionLBR.git
23-
GIT_TAG 1a6e25e407331c1d8c88be1a93ce44a5ba0628a2
23+
GIT_TAG d9f3746456ebd1c7116083492803995fba59c5a6
2424
)

Modules/Remote/BoneMorphometry.remote.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ itk_fetch_module(BoneMorphometry
77
http://hdl.handle.net/10380/3588
88
"
99
GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKBoneMorphometry.git
10-
GIT_TAG 5d152b584e311c89af926c82d5ca268d27f50976
10+
GIT_TAG f6b7a1427cc7f4e597a3032e4c49e8f7892e7fca
1111
)

Modules/Remote/DVMeshNoise.remote.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ itk_fetch_module(DVMeshNoise
66
http://hdl.handle.net/10380/3567
77
"
88
GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/DVMeshNoise
9-
GIT_TAG ed83b8291bcbc2d2718f198f1422182c8d7f4d11
9+
GIT_TAG 80d7815221173b20fcea75aabd973afb72c1e294
1010
)

Modules/Remote/IOFDF.remote.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
itk_fetch_module(IOFDF
22
"FDFImageIO plugin for ITK. Authors Gleen Pierce/Nick Tustison/Kent Williams"
33
GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/itkFDFImageIO.git
4-
GIT_TAG d87a7f1bed73addb1351152b6d82af41d4924a68
4+
GIT_TAG f6b4a00c610c9876987492fccc763a57f497448e
55
)

Modules/Remote/IOTransformDCMTK.remote.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ itk_fetch_module(IOTransformDCMTK
44
files. See http://www.insight-journal.org/browse/publication/923
55
https://hdl.handle.net/10380/3468"
66
GIT_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/ITKIOTransformDCMTK.git
7-
GIT_TAG 8be6a9e561b6a506121ec936bfe332b3917a9bf3
7+
GIT_TAG 6ffd7d9e1d4db35f093045a28da7045eda305fab
88
)

0 commit comments

Comments
 (0)