Browse Source

ENH: Remove extra files Libs/CTKExport.h and also directory Libs/DICOM/CMake

Jean-Christophe Fillion-Robin 15 years ago
parent
commit
b899ea1ca8

+ 0 - 21
Libs/CTKExport.h

@@ -1,21 +0,0 @@
-
-
-// .NAME __@MY_EXPORT_HEADER_PREFIX@Export - manage Windows system differences
-// .SECTION Description
-// The __@MY_EXPORT_HEADER_PREFIX@Export captures some system differences between Unix
-// and Windows operating systems. 
-
-#ifndef __@MY_EXPORT_HEADER_PREFIX@Export_h
-#define __@MY_EXPORT_HEADER_PREFIX@Export_h
-
-#if defined(WIN32) && !defined(@MY_LIBNAME@_STATIC)
- #if defined(@MY_LIBNAME@_EXPORTS)
-  #define @MY_LIBRARY_EXPORT_DIRECTIVE@ __declspec( dllexport ) 
- #else
-  #define @MY_LIBRARY_EXPORT_DIRECTIVE@ __declspec( dllimport ) 
- #endif
-#else
- #define @MY_LIBRARY_EXPORT_DIRECTIVE@
-#endif
-
-#endif

+ 0 - 104
Libs/DICOM/CMake/qCTKBuildLibMacro.cmake

@@ -1,104 +0,0 @@
-
-#
-#
-#
-MACRO(qctk_build_qtlib)
-  qCTK_PARSE_ARGUMENTS(MYQTLIB
-    "NAME;EXPORT_TEMPLATE;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
-    ""
-    ${ARGN}
-    )
-
-  # Sanity checks
-  IF(NOT DEFINED MYQTLIB_NAME)
-    MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MYQTLIB_NAME)
-  IF(NOT DEFINED MYQTLIB_EXPORT_DIRECTIVE)
-    MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MYQTLIB_EXPORT_DIRECTIVE)
-  IF(NOT DEFINED MYQTLIB_EXPORT_TEMPLATE)
-    MESSAGE(SEND_ERROR "EXPORT_TEMPLATE is mandatory")
-  ENDIF(NOT DEFINED MYQTLIB_EXPORT_TEMPLATE)
-  IF(NOT DEFINED MYQTLIB_LIBRARY_TYPE)
-    SET(MYQTLIB_LIBRARY_TYPE "SHARED")
-  ENDIF(NOT DEFINED MYQTLIB_LIBRARY_TYPE)
-
-  # Define library name
-  SET(lib_name ${MYQTLIB_NAME})
-
-  # --------------------------------------------------------------------------
-  # Include dirs
-  SET(my_includes
-    ${qCTK_BASE_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${MYQTLIB_INCLUDE_DIRECTORIES}
-    )  
-  SET(qCTK_BASE_INCLUDE_DIRS ${my_includes} CACHE INTERNAL "qCTK Base includes" FORCE)
-  INCLUDE_DIRECTORIES(
-    ${qCTK_BASE_INCLUDE_DIRS}
-    )  
- 
-  SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MYQTLIB_EXPORT_DIRECTIVE})
-  SET(MY_EXPORT_HEADER_PREFIX ${MYQTLIB_NAME})
-  SET(MY_LIBNAME ${lib_name})
-  
-  CONFIGURE_FILE(
-    ${MYQTLIB_EXPORT_TEMPLATE}
-    ${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h
-    )
-  SET(dynamicHeaders
-    "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
-
-  QT4_WRAP_CPP(MYQTLIB_SRCS ${MYQTLIB_MOC_SRCS})
-  QT4_WRAP_UI(MYQTLIB_UI_CXX ${MYQTLIB_UI_FORMS})
-  SET(MYQTLIB_QRC_SRCS "")
-  IF(DEFINED MYQTLIB_RESOURCES)
-    QT4_ADD_RESOURCES(MYQTLIB_QRC_SRCS ${MYQTLIB_RESOURCES})
-  ENDIF(DEFINED MYQTLIB_RESOURCES)
-
-  SOURCE_GROUP("Resources" FILES
-    ${MYQTLIB_RESOURCES}
-    ${MYQTLIB_UI_FORMS}
-    )
-
-  SOURCE_GROUP("Generated" FILES
-    ${MYQTLIB_MOC_SRCS}
-    ${MYQTLIB_QRC_SRCS}
-    ${MYQTLIB_UI_CXX}
-    )
-  
-  ADD_LIBRARY(${lib_name} ${MYQTLIB_LIBRARY_TYPE}
-    ${MYQTLIB_SRCS}
-    ${MYQTLIB_UI_CXX}
-    ${MYQTLIB_QRC_SRCS}
-    )
-
-  # Install rules
-  #IF(qCTK_BUILD_SHARED_LIBS)
-  #  INSTALL(TARGETS ${lib_name}
-  #    RUNTIME DESTINATION ${qCTK_INSTALL_BIN_DIR} COMPONENT Runtime
-  #    LIBRARY DESTINATION ${qCTK_INSTALL_LIB_DIR} COMPONENT Runtime
-  #    ARCHIVE DESTINATION ${qCTK_INSTALL_LIB_DIR} COMPONENT Development)
-  #ENDIF(qCTK_BUILD_SHARED_LIBS)
-  
-  SET(my_libs
-    ${qCTK_BASE_LIBRARIES}
-    ${MYQTLIB_TARGET_LIBRARIES}
-    )
-  TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})
-
-  # Update qCTK_BASE_LIBRARIES
-  SET(qCTK_BASE_LIBRARIES ${my_libs} ${lib_name} CACHE INTERNAL "qCTK Base libraries" FORCE)  
-  
-  # Install headers
-  #FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-  #INSTALL(FILES
-  #  ${headers}
-  #  ${dynamicHeaders}
-  #  DESTINATION ${qCTK_INSTALL_INCLUDE_DIR} COMPONENT Development
-  #  )
-
-ENDMACRO(qctk_build_qtlib)
-
-

+ 0 - 95
Libs/DICOM/CMake/qCTKBuildPluginMacro.cmake

@@ -1,95 +0,0 @@
-
-#
-#
-#
-MACRO(ov_build_qtplugin)
-  OV_PARSE_ARGUMENTS(MYQTPLUGIN
-    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES"
-    ""
-    ${ARGN}
-    )
-
-  # Sanity checks
-  IF(NOT DEFINED MYQTPLUGIN_NAME)
-    MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MYQTPLUGIN_NAME)
-  IF(NOT DEFINED MYQTPLUGIN_EXPORT_DIRECTIVE)
-    MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MYQTPLUGIN_EXPORT_DIRECTIVE)
-
-  # Define library name
-  SET(lib_name qOV${MYQTPLUGIN_NAME})
-
-  # --------------------------------------------------------------------------
-  # Include dirs
-  SET(my_includes
-    ${OmicsView_BASE_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${MYQTPLUGIN_INCLUDE_DIRECTORIES}
-    )  
-  INCLUDE_DIRECTORIES(
-    ${my_includes}
-    )  
- 
-  SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MYQTPLUGIN_EXPORT_DIRECTIVE})
-  SET(MY_EXPORT_HEADER_PREFIX qOV${MYQTPLUGIN_NAME})
-  SET(MY_LIBNAME ${lib_name})
-  
-  CONFIGURE_FILE(
-    ${OmicsView_SOURCE_DIR}/qOVExport.h.in
-    ${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h
-    )
-  SET(dynamicHeaders
-    "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
-
-  QT4_WRAP_CPP(MYQTPLUGIN_SRCS ${MYQTPLUGIN_MOC_SRCS})
-  QT4_WRAP_UI(MYQTPLUGIN_UI_CXX ${MYQTPLUGIN_UI_FORMS})
-  SET(MYQTPLUGIN_QRC_SRCS "")
-  IF(DEFINED MYQTPLUGIN_UI_RESOURCES)
-    QT4_ADD_RESOURCES(MYQTPLUGIN_QRC_SRCS ${MYQTPLUGIN_UI_RESOURCES})
-  ENDIF(DEFINED MYQTPLUGIN_UI_RESOURCES)
-
-  SOURCE_GROUP("Resources" FILES
-    ${MYQTPLUGIN_UI_RESOURCES}
-    ${MYQTPLUGIN_UI_FORMS}
-    )
-
-  SOURCE_GROUP("Generated" FILES
-    ${MYQTPLUGIN_MOC_SRCS}
-    ${MYQTPLUGIN_QRC_SRCS}
-    ${MYQTPLUGIN_UI_CXX}
-    )
-  
-  ADD_LIBRARY(${lib_name} ${OV_LIBRARY_TYPE}
-    ${MYQTPLUGIN_SRCS}
-    ${MYQTPLUGIN_UI_CXX}
-    ${MYQTPLUGIN_QRC_SRCS}
-    )
-
-  # Note: The plugin may be installed in some other location ???
-  # Install rules
-  IF(OV_BUILD_SHARED_LIBS)
-    INSTALL(TARGETS ${lib_name}
-      RUNTIME DESTINATION ${OV_INSTALL_BIN_DIR} COMPONENT Runtime
-      LIBRARY DESTINATION ${OV_INSTALL_LIB_DIR} COMPONENT Runtime
-      ARCHIVE DESTINATION ${OV_INSTALL_LIB_DIR} COMPONENT Development)
-  ENDIF(OV_BUILD_SHARED_LIBS)
-  
-  SET(my_libs
-    ${OmicsView_BASE_LIBRARIES}
-    ${MYQTPLUGIN_TARGET_LIBRARIES}
-    )
-  TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})
-  
-  # Install headers
-  FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-  INSTALL(FILES
-    ${headers}
-    ${dynamicHeaders}
-    DESTINATION ${OV_INSTALL_INCLUDE_DIR} COMPONENT Development
-    )
-
-ENDMACRO(ov_build_qtplugin)
-
-

+ 0 - 34
Libs/DICOM/CMake/qCTKParseArgumentsMacro.cmake

@@ -1,34 +0,0 @@
-
-#
-# See http://www.cmake.org/Wiki/CMakeMacroParseArguments
-#
-MACRO(qCTK_PARSE_ARGUMENTS prefix arg_names option_names)
-  SET(DEFAULT_ARGS)
-  FOREACH(arg_name ${arg_names})
-    SET(${prefix}_${arg_name})
-  ENDFOREACH(arg_name)
-  FOREACH(option ${option_names})
-    SET(${prefix}_${option} FALSE)
-  ENDFOREACH(option)
-
-  SET(current_arg_name DEFAULT_ARGS)
-  SET(current_arg_list)
-  FOREACH(arg ${ARGN})
-    SET(larg_names ${arg_names})
-    LIST(FIND larg_names "${arg}" is_arg_name)
-    IF (is_arg_name GREATER -1)
-      SET(${prefix}_${current_arg_name} ${current_arg_list})
-      SET(current_arg_name ${arg})
-      SET(current_arg_list)
-    ELSE (is_arg_name GREATER -1)
-      SET(loption_names ${option_names})    
-      LIST(FIND loption_names "${arg}" is_option)
-      IF (is_option GREATER -1)
-        SET(${prefix}_${arg} TRUE)
-      ELSE (is_option GREATER -1)
-        SET(current_arg_list ${current_arg_list} ${arg})
-      ENDIF (is_option GREATER -1)
-    ENDIF (is_arg_name GREATER -1)
-  ENDFOREACH(arg)
-  SET(${prefix}_${current_arg_name} ${current_arg_list})
-ENDMACRO(qCTK_PARSE_ARGUMENTS)