浏览代码

Remove unused/non-implemented VisualizationXIP library

Initially added in e6e1073 (ENH: Added class ctkXIPAdaptor to
Libs/Visualization/XIP.), the class was a place holder and the
functionality has never been implemented.
Jean-Christophe Fillion-Robin 9 年之前
父节点
当前提交
2211731fc6

+ 0 - 5
CMake/ctkBlockCheckDependencies.cmake

@@ -100,11 +100,6 @@ set(${VTK_enabling_variable}_LIBRARY_DIRS VTK_LIBRARY_DIRS)
 set(${VTK_enabling_variable}_INCLUDE_DIRS VTK_INCLUDE_DIRS)
 set(${VTK_enabling_variable}_FIND_PACKAGE_CMD VTK)
 
-set(XIP_enabling_variable XIP_LIBRARIES)
-set(${XIP_enabling_variable}_LIBRARY_DIRS XIP_LIBRARY_DIRS)
-set(${XIP_enabling_variable}_INCLUDE_DIRS XIP_INCLUDE_DIRS)
-set(${XIP_enabling_variable}_FIND_PACKAGE_CMD XIP)
-
 set(ZMQ_enabling_variable ZMQ_LIBRARIES)
 set(${ZMQ_enabling_variable}_LIBRARY_DIRS ZMQ_LIBRARY_DIRS)
 set(${ZMQ_enabling_variable}_INCLUDE_DIRS ZMQ_INCLUDE_DIRS)

+ 0 - 59
CMakeExternals/XIP.cmake

@@ -1,59 +0,0 @@
-#
-# XIP
-#
-
-set(proj XIP)
-
-set(${proj}_DEPENDENCIES "")
-
-ExternalProject_Include_Dependencies(${proj}
-  PROJECT_VAR proj
-  DEPENDS_VAR ${proj}_DEPENDENCIES
-  EP_ARGS_VAR ${proj}_EXTERNAL_PROJECT_ARGS
-  USE_SYSTEM_VAR ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj}
-  )
-
-if(${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
-  message(FATAL_ERROR "Enabling ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj} is not supported !")
-endif()
-
-# Sanity checks
-if(DEFINED XIP_DIR AND NOT EXISTS ${XIP_DIR})
-  message(FATAL_ERROR "XIP_DIR variable is defined but corresponds to non-existing directory")
-endif()
-
-
-if(NOT DEFINED XIP_DIR)
-
-  set(location_args )
-  if(${proj}_URL)
-    set(location_args URL ${${proj}_URL})
-  else()
-    set(location_args SVN_REPOSITORY "https://collab01a.scr.siemens.com/svn/xip/releases/latest"
-                      SVN_USERNAME "anonymous")
-  endif()
-
-  ExternalProject_Add(${proj}
-    ${${proj}_EXTERNAL_PROJECT_ARGS}
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}
-    BINARY_DIR ${proj}-build
-    PREFIX ${proj}${ep_suffix}
-    ${location_args}
-    INSTALL_COMMAND ""
-    CMAKE_CACHE_ARGS
-      ${ep_common_cache_args}
-      -DHAS_VTK:BOOL=OFF
-      -DHAS_ITK:BOOL=OFF
-    DEPENDS
-      ${${proj}_DEPENDENCIES}
-    )
-  set(XIP_DIR ${CMAKE_BINARY_DIR}/${proj}-build)
-
-else()
-  ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
-endif()
-
-mark_as_superbuild(
-  VARS XIP_DIR:PATH
-  LABELS "FIND_PACKAGE"
-  )

+ 0 - 4
CMakeLists.txt

@@ -532,9 +532,6 @@ ctk_lib_option(XNAT/Core
 ctk_lib_option(XNAT/Widgets
                "Build the XNAT Widgets library" OFF)
 
-#ctk_lib_option(Visualization/XIP
-#               "Build the XIP library" OFF)
-
 # Save the set of enabled libs in a cache file
 set(_enabled_libs)
 foreach(_lib ${CTK_LIBS})
@@ -938,7 +935,6 @@ set(CTK_DEPENDENCIES
   qxmlrpc
   qRestAPI
   OpenIGTLink
-  XIP
   ITK
   QtTesting
   )

+ 1 - 2
Documentation/Doxyfile.txt.in

@@ -751,8 +751,7 @@ RECURSIVE              = YES
 EXCLUDE                = @CTK_BINARY_DIR@ \
                          @CTK_SOURCE_DIR@/Utilities \
                          @CTK_SOURCE_DIR@/CMake/ctkDashboardDriverScript.cmake \
-                         @CTK_SOURCE_DIR@/CMake/ctkDashboardScript.TEMPLATE.cmake \
-                         @CTK_SOURCE_DIR@/Libs/Visualization/XIP
+                         @CTK_SOURCE_DIR@/CMake/ctkDashboardScript.TEMPLATE.cmake
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

+ 0 - 4
Libs/Visualization/Documentation/CTKVisualization.dox

@@ -7,8 +7,4 @@
 \ingroup Libs
 \ingroup Project_Widgets
 
-\defgroup Visualization_XIP Visualization XIP
-\ingroup Libs
-
-
 */

+ 0 - 60
Libs/Visualization/XIP/CMakeLists.txt

@@ -1,60 +0,0 @@
-project(CTKVisualizationXIP)
-
-#
-# See CTK/CMake/ctkMacroBuildLib.cmake for details
-#
-
-set(KIT_export_directive "CTK_VISUALIZATION_XIP_EXPORT")
-
-
-# Source files
-set(KIT_SRCS
-  ctkXIPAdaptor.cpp
-  ctkXIPAdaptor.h
-  )
-
-# Headers that should run through moc
-set(KIT_MOC_SRCS
-  ctkXIPAdaptor.h
-  )
-
-# UI files
-set(KIT_UI_FORMS
-)
-
-# Resources
-set(KIT_resources
-)
-
-# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
-# The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkFunctionGetTargetLibraries(KIT_target_libraries)
-
-ctkMacroBuildLib(
-  NAME ${PROJECT_NAME}
-  EXPORT_DIRECTIVE ${KIT_export_directive}
-  SRCS ${KIT_SRCS}
-  MOC_SRCS ${KIT_MOC_SRCS}
-  UI_FORMS ${KIT_UI_FORMS}
-  TARGET_LIBRARIES ${KIT_target_libraries}
-  RESOURCES ${KIT_resources}
-  LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-  )
-
-if(CTK_WRAP_PYTHONQT_LIGHT)
-  ctkMacroBuildLibWrapper(
-    TARGET ${PROJECT_NAME}
-    SRCS ${KIT_SRCS}
-    WRAPPER_LIBRARY_TYPE ${CTK_LIBRARY_MODE}
-    )
-endif()
-
-# Plugins
-#if(CTK_BUILD_QTDESIGNER_PLUGINS)
-#  add_subdirectory(Plugins)
-#endif()
-
-# Testing
-if(BUILD_TESTING)
-  #add_subdirectory(Testing)
-endif()

+ 0 - 1
Libs/Visualization/XIP/Testing/CMakeLists.txt

@@ -1 +0,0 @@
-add_subdirectory(Cpp)

+ 0 - 17
Libs/Visualization/XIP/Testing/Cpp/CMakeLists.txt

@@ -1,17 +0,0 @@
-set(KIT ${PROJECT_NAME})
-
-create_test_sourcelist(Tests ${KIT}CppTests.cpp
-  )
-
-SET (TestsToRun ${Tests})
-REMOVE (TestsToRun ${KIT}CppTests.cpp)
-
-set(LIBRARY_NAME ${PROJECT_NAME})
-
-add_executable(${KIT}CppTests ${Tests})
-target_link_libraries(${KIT}CppTests ${LIBRARY_NAME})
-
-#
-# Add Tests
-#
-

+ 0 - 53
Libs/Visualization/XIP/ctkXIPAdaptor.cpp

@@ -1,53 +0,0 @@
-/*=========================================================================
-
-  Library:   CTK
-
-  Copyright (c) Kitware Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0.txt
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=========================================================================*/
-
-// Qt includes
-#include <QDebug>
-
-// ctkXIPAdaptor includes
-#include "ctkXIPAdaptor.h"
-
-//----------------------------------------------------------------------------
-class ctkXIPAdaptorPrivate
-{
-public:
-  ctkXIPAdaptorPrivate();
-};
-
-//----------------------------------------------------------------------------
-// ctkXIPAdaptorPrivate methods
-
-//------------------------------------------------------------------------------
-ctkXIPAdaptorPrivate::ctkXIPAdaptorPrivate()
-{
-}
-
-//----------------------------------------------------------------------------
-// ctkXIPAdaptorWidget methods
-
-//------------------------------------------------------------------------------
-ctkXIPAdaptor::ctkXIPAdaptor(QObject* _parent): Superclass(_parent), d_ptr(new ctkXIPAdaptorPrivate)
-{
-}
-
-//----------------------------------------------------------------------------
-ctkXIPAdaptor::~ctkXIPAdaptor()
-{
-}

+ 0 - 48
Libs/Visualization/XIP/ctkXIPAdaptor.h

@@ -1,48 +0,0 @@
-/*=========================================================================
-
-  Library:   CTK
-
-  Copyright (c) Kitware Inc.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0.txt
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-
-=========================================================================*/
-
-#ifndef __ctkXIPAdaptor_h
-#define __ctkXIPAdaptor_h
-
-// Qt includes 
-#include <QObject>
-
-#include "ctkVisualizationXIPExport.h"
-
-class ctkXIPAdaptorPrivate;
-
-/// \ingroup Visualization_XIP
-class CTK_VISUALIZATION_XIP_EXPORT ctkXIPAdaptor : public QObject
-{
-  Q_OBJECT
-public:
-  typedef QObject Superclass;
-  explicit ctkXIPAdaptor(QObject* parent = 0);
-  virtual ~ctkXIPAdaptor();
-  
-protected:
-  QScopedPointer<ctkXIPAdaptorPrivate> d_ptr;
-
-private:
-  Q_DECLARE_PRIVATE(ctkXIPAdaptor);
-  Q_DISABLE_COPY(ctkXIPAdaptor);
-};
-
-#endif

+ 0 - 12
Libs/Visualization/XIP/ctk_library_options.cmake

@@ -1,12 +0,0 @@
-#
-# See CMake/ctkMacroAddCtkLibraryOptions.cmake
-# 
-# This file should list of options available for considered CTK library
-# For example: MYOPT1:OFF MYOPT2:ON
-# 
-
-set(ctk_library_options
-  #VTK:ON
-  #ITK:OFF
-  )
-  

+ 0 - 10
Libs/Visualization/XIP/target_libraries.cmake

@@ -1,10 +0,0 @@
-#
-# See CMake/ctkFunctionGetTargetLibraries.cmake
-# 
-# This file should list the libraries required to build the current CTK libraries
-# 
-
-set(target_libraries
-  CTKCore
-  XIP_LIBRARIES
-  )