Skip to content
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

Jump to bottom

Netlib triangle files violating the license #1920

Merged
merged 2 commits into from
Jul 15, 2020
Merged

Netlib triangle files violating the license #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f95961
BUG: Remove netnlib triangle classes
thewtex Jul 13, 2020
d106622
BUG: Remove License incompatible netlib files from vxl updates
thewtex Jul 13, 2020
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/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ else()
${ITKVNL_BINARY_DIR}/src/vxl/vcl
${ITKVNL_BINARY_DIR}/src/vxl/core
)
set(ITKVNL_LIBRARIES itkvnl_algo itkvnl itkv3p_netlib itknetlib itkvcl)
set(ITKVNL_LIBRARIES itkvnl_algo itkvnl itkv3p_netlib itkvcl)

if(ITK_TEMPLATE_VISIBILITY_DEFAULT)
add_definitions( "-DVNL_TEMPLATE_EXPORT=__attribute__((visibility(\"default\")))")
Expand Down
5 changes: 4 additions & 1 deletion Modules/ThirdParty/VNL/UpdateFromUpstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ upstream_git_branch='master'
snapshot_author_name='VXL Maintainers'
snapshot_author_email='vxl-maintainers@lists.sourceforge.net'

snapshot_redact_cmd=''
snapshot_redact_cmd='
rm v3p/netlib/triangle*
rm v3p/netlib/examples/showme.c
'
snapshot_relative_path='src/vxl'
snapshot_paths='
CMakeLists.txt
Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/VNL/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ add_subdirectory(vxl)
# Retrive the variable type to CACHE.
set(BUILD_EXAMPLES ${BUILD_EXAMPLES} CACHE BOOL "Build the examples from the ITK Software Guide." FORCE)

foreach(lib itkvcl itkv3p_netlib itktestlib itkvnl itkvnl_algo itknetlib)
foreach(lib itkvcl itkv3p_netlib itktestlib itkvnl itkvnl_algo)
itk_module_target(${lib} NO_INSTALL)
endforeach()

Expand Down
2 changes: 1 addition & 1 deletion Modules/ThirdParty/VNL/src/vxl/config/cmake/Modules/FindNetlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
set( NETLIB_FOUND "YES" )
set( NETLIB_INCLUDE_DIR ${VXL_ROOT_SOURCE_DIR}/v3p/netlib )
set( NETLIB_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/vxl/v3p/netlib )
set( NETLIB_LIBRARIES ${VXL_LIB_PREFIX}netlib ${VXL_LIB_PREFIX}v3p_netlib )
set( NETLIB_LIBRARIES ${VXL_LIB_PREFIX}v3p_netlib )
4 changes: 4 additions & 0 deletions Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

project( netlib C )

# Incompatible with ITK's License
if(0)
set(netlib_sources
# The "Triangle" program of Jonathan Richard Shewchuk
triangle.c triangle.h
Expand All @@ -13,6 +15,8 @@ vxl_add_library(LIBRARY_NAME ${VXL_LIB_PREFIX}netlib
if(UNIX)
target_link_libraries( ${VXL_LIB_PREFIX}netlib m )
endif()
# Incompatible with ITK's License
endif()

# Allow sources in subdirectories to see the include files.
include_directories(${netlib_SOURCE_DIR})
Expand Down
Loading