Skip to content

Commit

Permalink
COMP: Make USE_FFTW consistent with ITK_USE_FFTW.
Browse files Browse the repository at this point in the history
  • Loading branch information
hjmjohnson committed Jan 18, 2013
1 parent de1ade5 commit d39ce43
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions ANTS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ if(CMAKE_CL_64 OR MSVC)
add_definitions(/bigobj)
endif()

option(USE_FFTWD "Use double precision fftw if found" OFF)
option(USE_FFTWF "Use single precision fftw if found" OFF)
option(USE_SYSTEM_FFTW "Use an installed version of fftw" OFF)
if (USE_FFTWD OR USE_FFTWF)
if(USE_SYSTEM_FFTW)
option(ITK_USE_FFTWD "Use double precision fftw if found" OFF)
option(ITK_USE_FFTWF "Use single precision fftw if found" OFF)
option(ITK_USE_SYSTEM_FFTW "Use an installed version of fftw" OFF)
if (ITK_USE_FFTWD OR ITK_USE_FFTWF)
if(ITK_USE_SYSTEM_FFTW)
find_package( FFTW )
link_directories(${FFTW_LIBDIR})
else(USE_SYSTEM_FFTW)
else(ITK_USE_SYSTEM_FFTW)
link_directories(${ITK_DIR}/fftw/lib)
include_directories(${ITK_DIR}/fftw/include)
endif(USE_SYSTEM_FFTW)
endif(USE_FFTWD OR USE_FFTWF)
endif(ITK_USE_SYSTEM_FFTW)
endif(ITK_USE_FFTWD OR ITK_USE_FFTWF)

# These are configure time options that specify which
# subset of tests should be run
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_ITKv4.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ if(NOT DEFINED ${extProjName}_DIR AND NOT ${USE_SYSTEM_${extProjName}})
# link properly if -fopenmp is used.
string(REPLACE "-fopenmp" "" ITK_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REPLACE "-fopenmp" "" ITK_CMAKE_CXX_FLAGS "${CMAKE_CX_FLAGS}")
if(USE_FFTWD OR USE_FFTWF)
if(ITK_USE_FFTWD OR ITK_USE_FFTWF)
set(FFTWF_FLAGS -DUSE_FFTWF:BOOL=ON)
else()
set(FFTWF_FLAGS "")
Expand Down

0 comments on commit d39ce43

Please sign in to comment.