Skip to content
Snippets Groups Projects
Commit 310be201 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

SuperBuild: patch itk

parent 10b174e1
No related branches found
No related tags found
No related merge requests found
diff -burN InsightToolkit-4.10.0.orig/Modules/ThirdParty/VNL/src/CMakeLists.txt InsightToolkit-4.10.0/Modules/ThirdParty/VNL/src/CMakeLists.txt
--- InsightToolkit-4.10.0.orig/Modules/ThirdParty/VNL/src/CMakeLists.txt 2016-11-23 15:59:11.409392257 +0100
+++ InsightToolkit-4.10.0/Modules/ThirdParty/VNL/src/CMakeLists.txt 2016-11-23 16:26:47.185472392 +0100
@@ -18,7 +18,7 @@
# 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 itkvnl itkvnl_algo itknetlib)
itk_module_target(${lib} NO_INSTALL)
endforeach()
diff -burN InsightToolkit-4.10.0.orig/Modules/ThirdParty/ZLIB/CMakeLists.txt InsightToolkit-4.10.0/Modules/ThirdParty/ZLIB/CMakeLists.txt
--- InsightToolkit-4.10.0.orig/Modules/ThirdParty/ZLIB/CMakeLists.txt 2016-11-23 15:59:11.421392257 +0100
+++ InsightToolkit-4.10.0/Modules/ThirdParty/ZLIB/CMakeLists.txt 2016-11-23 16:26:35.889471845 +0100
@@ -6,14 +6,12 @@
if(ITK_USE_SYSTEM_ZLIB)
find_package(ZLIB REQUIRED)
- set(ITKZLIB_INCLUDE_DIRS
- ${ITKZLIB_BINARY_DIR}/src
- )
- set(ITKZLIB_SYSTEM_INCLUDE_DIRS
- ${ZLIB_INCLUDE_DIRS}
- )
- set(ITKZLIB_LIBRARIES "${ZLIB_LIBRARIES}")
set(ITKZLIB_NO_SRC 1)
+ set(ITKZLIB_EXPORT_CODE_BUILD
+"set(ITKZLIB_INCLUDE_DIRS \"${ITKZLIB_BINARY_DIR}/src;${ZLIB_INCLUDE_DIRS}\" )
+set(ITKZLIB_LIBRARIES \"${ZLIB_LIBRARIES}\")
+")
+set(ITKZLIB_EXPORT_CODE_INSTALL "find_package(ZLIB REQUIRED)")
else()
set(ITKZLIB_INCLUDE_DIRS
${ITKZLIB_BINARY_DIR}/src
diff -burN InsightToolkit-4.10.0.orig/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt InsightToolkit-4.10.0/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt
--- InsightToolkit-4.10.0.orig/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt 2016-12-06 16:03:06.000000000 +0100
+++ InsightToolkit-4.10.0/Modules/ThirdParty/VNL/src/vxl/core/CMakeLists.txt 2016-12-06 16:03:44.000000000 +0100
@@ -131,8 +131,10 @@
set(CORE_VIDEO_FOUND OFF CACHE INTERNAL "VXL core video libraries built")
endif ()
+if(BUILD_TESTING)
# common test executable
add_subdirectory(testlib)
+endif()
# Tests that check and output the vxl configuration
# NOTE: some external projects remove the tests directory (aka ITK)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment