CMake/ITKModuleRemote.cmake | 8 -------- Modules/Core/Common/include/itkArray.h | 2 +- Modules/Core/Common/include/itkArray2D.h | 2 +- Modules/ThirdParty/MINC/CMakeLists.txt | 1 + Modules/ThirdParty/Netlib/src/netlib/slatec/CMakeLists.txt | 2 +- Modules/ThirdParty/VNL/CMakeLists.txt | 2 +- Modules/ThirdParty/libLBFGS/src/CMakeLists.txt | 1 + 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/CMake/ITKModuleRemote.cmake b/CMake/ITKModuleRemote.cmake index 8ad0f8cf2b..fb71bd2b97 100644 --- a/CMake/ITKModuleRemote.cmake +++ b/CMake/ITKModuleRemote.cmake @@ -231,14 +231,6 @@ function(itk_fetch_module _name _description) if(DEFINED Module_${_name}_BUILD_EXAMPLES) set_property(CACHE Module_${_name}_BUILD_EXAMPLES PROPERTY TYPE BOOL) endif() - - if (NOT REMOTE_GIT_TAG STREQUAL "") - _fetch_with_git("${GIT_EXECUTABLE}" - "${_fetch_options_GIT_REPOSITORY}" - "${REMOTE_GIT_TAG}" - "${ITK_SOURCE_DIR}/Modules/Remote/${_name}" - ) - endif() else() # Hide remote module options if not building. if(DEFINED Module_${_name}_GIT_TAG) diff --git a/Modules/Core/Common/include/itkArray.h b/Modules/Core/Common/include/itkArray.h index 24870d3a45..e8e96b0569 100644 --- a/Modules/Core/Common/include/itkArray.h +++ b/Modules/Core/Common/include/itkArray.h @@ -185,7 +185,7 @@ public: #endif /** This destructor is not virtual for performance reasons. However, this * means that subclasses cannot allocate memory. */ - ~Array() override; + ~Array(); #if !defined(ITK_LEGACY_REMOVE) void diff --git a/Modules/Core/Common/include/itkArray2D.h b/Modules/Core/Common/include/itkArray2D.h index 24e9ee14fc..e1ef97fbea 100644 --- a/Modules/Core/Common/include/itkArray2D.h +++ b/Modules/Core/Common/include/itkArray2D.h @@ -87,7 +87,7 @@ public: /** This destructor is not virtual for performance reasons. However, this * means that subclasses cannot allocate memory. */ - ~Array2D() override = default; + ~Array2D() = default; }; template diff --git a/Modules/ThirdParty/MINC/CMakeLists.txt b/Modules/ThirdParty/MINC/CMakeLists.txt index 5644257e3e..9585878e09 100644 --- a/Modules/ThirdParty/MINC/CMakeLists.txt +++ b/Modules/ThirdParty/MINC/CMakeLists.txt @@ -28,6 +28,7 @@ endif() set(ITKMINC_INCLUDE_DIRS ${ITKMINC_BINARY_DIR} ${LIBMINC_INCLUDE_DIRS} + ${NETCDF_INCLUDE_DIR} ) set(ITKMINC_LIBRARY_DIRS diff --git a/Modules/ThirdParty/Netlib/src/netlib/slatec/CMakeLists.txt b/Modules/ThirdParty/Netlib/src/netlib/slatec/CMakeLists.txt index 522662a244..dde643e086 100644 --- a/Modules/ThirdParty/Netlib/src/netlib/slatec/CMakeLists.txt +++ b/Modules/ThirdParty/Netlib/src/netlib/slatec/CMakeLists.txt @@ -23,7 +23,7 @@ ADD_LIBRARY( itkNetlibSlatec ) IF(ITK_USE_SYSTEM_VXL) - TARGET_LINK_LIBRARIES( itkNetlibSlatec v3p_netlib netlib) + TARGET_LINK_LIBRARIES( itkNetlibSlatec v3p_netlib v3px_netlib) ELSE(ITK_USE_SYSTEM_VXL) TARGET_LINK_LIBRARIES( itkNetlibSlatec itkv3p_netlib ) ENDIF(ITK_USE_SYSTEM_VXL) diff --git a/Modules/ThirdParty/VNL/CMakeLists.txt b/Modules/ThirdParty/VNL/CMakeLists.txt index 494d8b179d..86d29e1f87 100644 --- a/Modules/ThirdParty/VNL/CMakeLists.txt +++ b/Modules/ThirdParty/VNL/CMakeLists.txt @@ -16,7 +16,7 @@ if(ITK_USE_SYSTEM_VXL) ${VXL_CORE_INCLUDE_DIRS} ${VXL_CORE_INCLUDE_DIR} ) - set(ITKVNL_LIBRARIES vnl_algo vnl v3p_netlib netlib vcl) + set(ITKVNL_LIBRARIES vnl_algo vnl v3p_netlib v3px_netlib vcl) set(ITKVNL_SYSTEM_LIBRARY_DIRS "${VXL_LIBRARY_DIR}") set(ITKVNL_NO_SRC 1) else() diff --git a/Modules/ThirdParty/libLBFGS/src/CMakeLists.txt b/Modules/ThirdParty/libLBFGS/src/CMakeLists.txt index 7babdc9462..5b82594459 100644 --- a/Modules/ThirdParty/libLBFGS/src/CMakeLists.txt +++ b/Modules/ThirdParty/libLBFGS/src/CMakeLists.txt @@ -1,6 +1,7 @@ ADD_LIBRARY( itklbfgs lbfgs.c ) +TARGET_LINK_LIBRARIES(itklbfgs m) IF(ITK_LIBRARY_PROPERTIES) SET_TARGET_PROPERTIES(itklbfgs PROPERTIES ${ITK_LIBRARY_PROPERTIES})