Skip to content

Commit

Permalink
BUG: Remove src folder
Browse files Browse the repository at this point in the history
Set TotalVariation_LIBRARIES to proxTV directly
  • Loading branch information
phcerdan committed Apr 11, 2019
1 parent 53d9fab commit c3a20ea
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 36 deletions.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
cmake_minimum_required(VERSION 3.10.2)
project(TotalVariation)

set(TotalVariation_LIBRARIES TotalVariation)
if(ITK_USE_SYSTEM_proxTV)
set(TotalVariation_LIBRARIES proxTV::proxTV)
else()
set(TotalVariation_LIBRARIES proxTV)
endif()

set(${PROJECT_NAME}_THIRD_PARTY 1)

Expand Down Expand Up @@ -116,6 +120,7 @@ if(${_populate_include_dirs_for_swig})
set(TotalVariation_INCLUDE_DIRS ${proxTV_INCLUDE_DIRS_STRIP})
endif()


# Populate module variables
if(NOT ITK_SOURCE_DIR)
include(ITKModuleExternal)
Expand All @@ -124,5 +129,6 @@ else()
itk_module_impl()
endif()


# Add the proxTV library to Modules/Targets/TotalVariationTargets.cmake
itk_module_target(${_proxTV_lib} NO_INSTALL)
4 changes: 1 addition & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ ITK provides wrapping for Windows, macOS and Linux:
import itk
Dimension = 3
I = itk.Image[itk.F, Dimension]
# file_name="/tmp/img.nrrd"
reader = itk.ImageFileReader[I].New(FileName=file_name)
reader.Update()
image = reader.GetOutput()
Expand All @@ -29,7 +28,6 @@ ITK provides wrapping for Windows, macOS and Linux:
output_file_name="/tmp/tvout.nrrd"
itk.imwrite(tv.GetOutput(), output_file_name)
Examples of 3D image denoised

Original:
Expand All @@ -52,7 +50,7 @@ Denoised:
And the branch in my fork: <https://github.com/phcerdan/proxTV/tree/cmake_support>
- [x] Uses CMake FetchContent to download the third party proxTV.
- [x] Do the actual wrapping with ITK classes.
- [ ] Check that python module: itk-totalvariation works for:
- [x] Check that python module: itk-totalvariation works for:
- [x] Linux
- [x] Mac
- [ ] Windows
Expand Down
13 changes: 0 additions & 13 deletions src/CMakeLists.txt

This file was deleted.

19 changes: 0 additions & 19 deletions src/itkProxTVImageFilter.cxx

This file was deleted.

0 comments on commit c3a20ea

Please sign in to comment.