Merge pull request #1920 from thewtex/netlib-triangle-update

Netlib triangle files violating the license
InsightSoftwareConsortium · Jul 15, 2020 · 28e1e9a · 28e1e9a
2 parents 2121eed + d106622
commit 28e1e9a
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 19,904 deletions.
diff --git a/Modules/ThirdParty/VNL/CMakeLists.txt b/Modules/ThirdParty/VNL/CMakeLists.txt
@@ -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\")))")

diff --git a/Modules/ThirdParty/VNL/UpdateFromUpstream.sh b/Modules/ThirdParty/VNL/UpdateFromUpstream.sh
@@ -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

diff --git a/Modules/ThirdParty/VNL/src/CMakeLists.txt b/Modules/ThirdParty/VNL/src/CMakeLists.txt
@@ -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()
 

diff --git a/Modules/ThirdParty/VNL/src/vxl/config/cmake/Modules/FindNetlib.cmake b/Modules/ThirdParty/VNL/src/vxl/config/cmake/Modules/FindNetlib.cmake
@@ -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 )
diff --git a/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt b/Modules/ThirdParty/VNL/src/vxl/v3p/netlib/CMakeLists.txt
@@ -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
@@ -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})