Skip to content

Commit

Permalink
ENH: Remove support for building OpenIGTLink now available as an exte…
Browse files Browse the repository at this point in the history
…nsion

See https://github.com/openigtlink/SlicerOpenIGTLink

Co-authored-by: Andras Lasso <lasso@queensu.ca>
Co-authored-by: Jean-Christophe Fillion-Robin <JChris.FillionR@kitware.com>
svn-url: http://viewvc.slicer.org/viewvc.cgi/Slicer4?view=revision&revision=26972
git-svn-id: http://svn.slicer.org/Slicer4/trunk@26972 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information
3 people committed Mar 1, 2018
1 parent 4e5b4f3 commit 724edb0
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 41 deletions.
3 changes: 0 additions & 3 deletions CMake/CTestCustom.cmake.in
Expand Up @@ -149,9 +149,6 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
# JsonCpp
"json.(reader|value).h.*warning C4275.*non dll-interface class"

# Libs/OpenIGTLink
"(OpenIGTLink|openigtlink).[Ss]ource.igtl"

# Libs/tclap
"tclap.include.tclap.*Arg.h.*warning C4512"

Expand Down
8 changes: 0 additions & 8 deletions CMake/SlicerBlockInstallCMakeProjects.cmake
Expand Up @@ -63,14 +63,6 @@ if(NOT "${Teem_DIR}" STREQUAL "" AND EXISTS "${Teem_DIR}/CMakeCache.txt")
set(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${Teem_DIR};teem;RuntimeLibraries;/")
endif()

# -------------------------------------------------------------------------
# Install OpenIGTLink
# -------------------------------------------------------------------------
if(Slicer_USE_OpenIGTLink
AND NOT "${OpenIGTLink_DIR}" STREQUAL "" AND EXISTS "${OpenIGTLink_DIR}/CMakeCache.txt")
set(CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${OpenIGTLink_DIR};igtl;RuntimeLibraries;/")
endif()

# -------------------------------------------------------------------------
# Install CTK
# -------------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions CMake/SlicerCPack.cmake
Expand Up @@ -111,9 +111,6 @@ else()
endif()

# Calling find_package will ensure the *_LIBRARY_DIRS expected by the fixup script are set.
if(Slicer_USE_OpenIGTLink)
find_package(OpenIGTLink REQUIRED)
endif()
if(Slicer_BUILD_CLI_SUPPORT)
find_package(SlicerExecutionModel REQUIRED)
endif()
Expand Down
6 changes: 0 additions & 6 deletions CMake/SlicerCPackBundleFixup.cmake.in
Expand Up @@ -237,12 +237,6 @@ function(fixup_bundle_with_plugins app)
if(Slicer_BUILD_EXTENSIONMANAGER_SUPPORT)
_fixup_paths_append(libs_path "@LibArchive_DIR@/lib")
endif()
set(Slicer_USE_OpenIGTLink "@Slicer_USE_OpenIGTLink@")
if(Slicer_USE_OpenIGTLink)
foreach(dir "@OpenIGTLink_LIBRARY_DIRS@")
_fixup_paths_append(libs_path ${dir})
endforeach()
endif()
if(Slicer_USE_PYTHONQT)
_fixup_paths_append(libs_path "@PYTHON_LIBRARY_PATH@")
endif()
Expand Down
1 change: 0 additions & 1 deletion CMake/SlicerConfig.cmake.in
Expand Up @@ -113,7 +113,6 @@ endif()
# Slicer options
# --------------------------------------------------------------------------
set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
set(Slicer_USE_OpenIGTLink "@Slicer_USE_OpenIGTLink@")
set(Slicer_USE_PYTHONQT "@Slicer_USE_PYTHONQT@")
set(Slicer_USE_PYTHONQT_WITH_TCL "@Slicer_USE_PYTHONQT_WITH_TCL@")
set(Slicer_USE_QtTesting "@Slicer_USE_QtTesting@")
Expand Down
3 changes: 0 additions & 3 deletions CMake/SlicerGenerateSlicerConfig.cmake
Expand Up @@ -161,9 +161,6 @@ if(Slicer_BUILD_DICOM_SUPPORT)
list(APPEND Slicer_EXTERNAL_PROJECTS_CONFIG DCMTK)
list(APPEND Slicer_EXTERNAL_PROJECTS_NO_USEFILE_CONFIG DCMTK)
endif()
if(Slicer_USE_OpenIGTLink)
list(APPEND Slicer_EXTERNAL_PROJECTS_CONFIG OpenIGTLink)
endif()
if(Slicer_USE_PYTHONQT)
list(APPEND Slicer_EXTERNAL_PROJECTS_CONFIG PythonLibs PythonInterp)
list(APPEND Slicer_EXTERNAL_PROJECTS_NO_USEFILE_CONFIG PythonLibs PythonInterp)
Expand Down
3 changes: 0 additions & 3 deletions CMakeLists.txt
Expand Up @@ -283,9 +283,6 @@ CMAKE_DEPENDENT_OPTION(
"Slicer_USE_PYTHONQT" OFF)
mark_as_superbuild(Slicer_USE_NUMPY)

option(Slicer_USE_OpenIGTLink "Build Slicer with OpenIGTLink support." OFF)
mark_as_superbuild(Slicer_USE_OpenIGTLink)

option(Slicer_USE_CTKAPPLAUNCHER "Configure ctkAppLauncher." ON)
mark_as_advanced(Slicer_USE_CTKAPPLAUNCHER)
mark_as_superbuild(Slicer_USE_CTKAPPLAUNCHER)
Expand Down
14 changes: 0 additions & 14 deletions SuperBuild.cmake
Expand Up @@ -117,10 +117,6 @@ set(Slicer_DEPENDENCIES

set(CURL_ENABLE_SSL ${Slicer_USE_PYTHONQT_WITH_OPENSSL})

if(Slicer_USE_OpenIGTLink)
list(APPEND Slicer_DEPENDENCIES OpenIGTLink)
endif()

if(Slicer_USE_SimpleITK)
list(APPEND Slicer_DEPENDENCIES SimpleITK)
endif()
Expand Down Expand Up @@ -215,16 +211,6 @@ Slicer_Remote_Add(jqPlot
)
list(APPEND Slicer_REMOTE_DEPENDENCIES jqPlot)

Slicer_Remote_Add(OpenIGTLinkIF
GIT_REPOSITORY ${EP_GIT_PROTOCOL}://github.com/Slicer/OpenIGTLinkIF.git
GIT_TAG 0266aa27ad19a00f8d2b1c04736b9f3d3fb25aee
LICENSE_FILES "https://www.slicer.org/LICENSE"
OPTION_NAME Slicer_BUILD_OpenIGTLinkIF
OPTION_DEPENDS "Slicer_BUILD_QTLOADABLEMODULES;Slicer_USE_OpenIGTLink"
LABELS REMOTE_MODULE
)
list_conditional_append(Slicer_BUILD_OpenIGTLinkIF Slicer_REMOTE_DEPENDENCIES OpenIGTLinkIF)

option(Slicer_BUILD_MULTIVOLUME_SUPPORT "Build MultiVolume support." ON)
mark_as_advanced(Slicer_BUILD_MULTIVOLUME_SUPPORT)

Expand Down

0 comments on commit 724edb0

Please sign in to comment.