Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: Rebased existing fix-tbbwarnings branch to current master #498

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ENH: Rebased existing fix-tbbwarnings branch to current master #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion SuperBuild/External_DCMTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
set(proj DCMTK)

# Set dependency list
set(${proj}_DEPENDENCIES "zlib")
set(${proj}_DEPENDENCIES ""
# "zlib"
)

# Include dependent projects if any
ExternalProject_Include_Dependencies(${proj} PROJECT_VAR proj DEPENDS_VAR ${proj}_DEPENDENCIES)
Expand Down
11 changes: 10 additions & 1 deletion SuperBuild/External_ITKv5.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ set(proj ITKv5)
set(${proj}_REQUIRED_VERSION 5.3)

# Set dependency list
set(${proj}_DEPENDENCIES "zlib")
set(${proj}_DEPENDENCIES ""
# "zlib"
)
if(${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_TBB)
list(APPEND ${proj}_DEPENDENCIES "TBB")
endif()
Expand Down Expand Up @@ -161,6 +163,13 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
-DModule_ITKTBB:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_TBB}
-DTBB_DIR:PATH=${TBB_DIR}
#INSTALL_COMMAND ""
-DITK_USE_FFTWF:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_FFTW}
-DITK_USE_FFTWD:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_FFTW}
-DITK_USE_GOLD_LINKER:BOOL=OFF ## RHEL7 fails to build GDCM with gold linker
# TBB
-DModule_ITKTBB:BOOL=${${SUPERBUILD_TOPLEVEL_PROJECT}_REQUIRES_TBB}
-DTBB_DIR:PATH=${TBB_DIR}
#INSTALL_COMMAND ""
DEPENDS
${${proj}_DEPENDENCIES}
)
Expand Down
4 changes: 3 additions & 1 deletion SuperBuild/External_OpenJPEG.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ if(DEFINED ${extProjName}_DIR AND NOT EXISTS ${${extProjName}_DIR})
endif()

# Set dependency list
set(${proj}_DEPENDENCIES zlib)
set(${proj}_DEPENDENCIES ""
# "zlib"
)

# Include dependent projects if any
ExternalProject_Include_Dependencies(${proj} PROJECT_VAR proj DEPENDS_VAR ${proj}_DEPENDENCIES)
Expand Down
18 changes: 12 additions & 6 deletions SuperBuild/External_VTK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ set(VTK_VERSION_MINOR 2)
set(${proj}_REQUIRED_VERSION "9.2") #If a required version is necessary, then set this, else leave blank

# Set dependency list
set(${proj}_DEPENDENCIES "zlib" )
#"TBB")
set(${proj}_DEPENDENCIES ""
# "zlib"
# "TBB"
)

# Include dependent projects if any
ExternalProject_Include_Dependencies(${proj} PROJECT_VAR proj DEPENDS_VAR ${proj}_DEPENDENCIES)
Expand Down Expand Up @@ -107,10 +109,14 @@ if((NOT DEFINED VTK_DIR OR NOT DEFINED VTK_SOURCE_DIR) AND NOT ${CMAKE_PROJECT_N
${VTK_QT_ARGS}
${VTK_MAC_ARGS}
# ZLIB
-D${proj}_USE_SYSTEM_ZLIB:BOOL=ON
-DZLIB_ROOT:PATH=${ZLIB_ROOT}
-DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIR}
-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY}
#-D${proj}_USE_SYSTEM_ZLIB:BOOL=ON
#-DZLIB_ROOT:PATH=${ZLIB_ROOT}
#-DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIR}
#-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY}
-D${proj}_USE_SYSTEM_ZLIB:BOOL=OFF
-DZLIB_ROOT:PATH=""
-DZLIB_INCLUDE_DIR:PATH=""
-DZLIB_LIBRARY:FILEPATH=""
# TBB
-DVTK_SMP_IMPLEMENTATION_TYPE:STRING=Sequential
#-DVTK_SMP_IMPLEMENTATION_TYPE:STRING=TBB
Expand Down
4 changes: 3 additions & 1 deletion SuperBuild/External_teem.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
set(proj teem)

# Set dependency list
set(${proj}_DEPENDENCIES zlib)
set(${proj}_DEPENDENCIES ""
#zlib
)
if(NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_teem)
list(APPEND teem_DEPENDENCIES ${VTK_EXTERNAL_NAME})
endif()
Expand Down