Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Modules/ThirdParty/VNL/UpdateFromUpstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readonly name='VXL'
readonly ownership='Insight Software Consortium Maintainers <https://discourse.itk.org/>'
readonly subtree="Modules/ThirdParty/VNL/src/vxl"
readonly repo="https://github.com/InsightSoftwareConsortium/vxl.git"
readonly tag="for/itk-vxl-master-ae2f579" # 2026-07-06 (ae2f579: remove obsolete vcl iterator test)
readonly tag="for/itk-vxl-master-a0790d7" # 2026-09-20 (a0790d7: remove the unused vcl_where_root_dir mechanism)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good as is. In the future, moving the upstream tag is better as the first commit (rather than the last).

readonly shortlog=false
readonly exact_tree_match=false
readonly paths="
Expand Down
13 changes: 0 additions & 13 deletions Modules/ThirdParty/VNL/src/vxl/core/testlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# ./vxl/testlib/CMakeLists.txt

find_file(TESTLIB_VCL_WHERE_ROOT_DIR_H
vcl_where_root_dir.h
${VXL_BINARY_DIR}/vcl )

if(TESTLIB_VCL_WHERE_ROOT_DIR_H)
add_compile_definitions(VCL_WHERE_ROOT_DIR_H_EXISTS)
else()
unset(TESTLIB_VCL_WHERE_ROOT_DIR_H)
endif()

set(testlib_sources

# Useful utilities for the tests
Expand All @@ -20,9 +10,6 @@ set(testlib_sources

# The main function of the driver executable
testlib_main.cxx

# Used to locate test files in source tree
testlib_root_dir.h testlib_root_dir.cxx
)

vxl_add_library(LIBRARY_NAME itktestlib
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ testlib_register_test(const std::string &, TestMainFunction);
// This allows the main function to be defined in the driver code
// itself--instead of in the testlib library--thus avoiding
// "awf-weirdness". This also means that functionality from the test
// library, such as testlib_root_dir, can be used even if it is not
// library can be used even if it is not
// used to create a test driver.
#define DEFINE_MAIN \
int testlib_main(int, char *[]); \
Expand Down
37 changes: 0 additions & 37 deletions Modules/ThirdParty/VNL/src/vxl/core/testlib/testlib_root_dir.cxx

This file was deleted.

33 changes: 0 additions & 33 deletions Modules/ThirdParty/VNL/src/vxl/core/testlib/testlib_root_dir.h

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ add_executable( testlib_test_all
test_assert.cxx
test_macros.cxx
test_args.cxx
test_root_dir.cxx
)
target_link_libraries( testlib_test_all itktestlib )

add_test( NAME testlib_assert COMMAND testlib_test_all test_assert )
add_test( NAME testlib_macros COMMAND testlib_test_all test_macros )
add_test( NAME testlib_args COMMAND testlib_test_all test_args one two )
add_test( NAME testlib_root_dir COMMAND testlib_test_all test_root_dir )
add_test( NAME testlib_all COMMAND testlib_test_all all one two )

add_executable( testlib_test_link
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
DECLARE(test_assert);
DECLARE(test_macros);
DECLARE(test_args);
DECLARE(test_root_dir);

void
register_tests()
{
REGISTER(test_assert);
REGISTER(test_macros);
REGISTER(test_args);
REGISTER(test_root_dir);
}

DEFINE_MAIN;
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "testlib/testlib_register.h"
#include "testlib/testlib_root_dir.h"
#include "testlib/testlib_test.h"

int
Expand Down

This file was deleted.

5 changes: 2 additions & 3 deletions Modules/ThirdParty/VNL/src/vxl/vcl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# vcl/CMakeLists.txt
#
# vcl is header-only: it provides the configured vcl_compiler.h /
# vcl_where_root_dir.h and the vcl_msvc_warnings.h shim. The "vcl" INTERFACE
# vcl is header-only: it provides the configured vcl_compiler.h and the
# vcl_msvc_warnings.h shim. The "vcl" INTERFACE
# target carries the vcl and core include roots (source and generated) so any
# target that links it resolves <vcl_compiler.h>, <vxl_config.h> and <vnl/...>
# without a global include_directories.
Expand All @@ -15,7 +15,6 @@ else()
set(_config_destination ${VXL_INSTALL_INCLUDE_DIR})
endif()
vxl_configure_file(${CMAKE_CURRENT_LIST_DIR}/vcl_compiler.h.in ${PROJECT_BINARY_DIR}/vcl_compiler.h ${_config_destination})
vxl_configure_file(${CMAKE_CURRENT_LIST_DIR}/vcl_where_root_dir.h.in ${PROJECT_BINARY_DIR}/vcl_where_root_dir.h ${_config_destination})

install(FILES vcl_msvc_warnings.h
DESTINATION ${_config_destination}
Expand Down
1 change: 0 additions & 1 deletion Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_include.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
# include "vcl_msvc_warnings.h"
#endif

#include <vcl_where_root_dir.h>

int
main()
Expand Down
15 changes: 0 additions & 15 deletions Modules/ThirdParty/VNL/src/vxl/vcl/vcl_where_root_dir.h.in

This file was deleted.

Loading