re #842: Renamed stable branch to Plus-2.4

Plus-2.4.0 is a specific version name that can be used as tag, but we create all Plus-2.4 releases in a single branch.

Author: lassoan

PlusLib/CMakeLists.txt

@@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0)
 # ------------------------------------------------------------------------
 # Set project version number
 SET(PLUSLIB_VERSION_MAJOR "2")
-SET(PLUSLIB_VERSION_MINOR "5")
+SET(PLUSLIB_VERSION_MINOR "3")
 SET(PLUSLIB_VERSION_PATCH "0")
 SET(PLUSLIB_VERSION ${PLUSLIB_VERSION_MAJOR}.${PLUSLIB_VERSION_MINOR}.${PLUSLIB_VERSION_PATCH})
 
@@ -125,23 +125,6 @@ MARK_AS_ADVANCED(USDIGITAL_SEI_BASE_DIR
   USDIGITAL_SEI_LIB_DIR
   )
 
-IF( WIN32 )
-  SET( NVIDIA_DVP_BASE_DIR ${PLUSLIB_TOOLS_DIR}/NVidia/dvp170 )
-  SET( NVIDIA_DVP_INCLUDE_DIR ${NVIDIA_DVP_BASE_DIR}/include CACHE PATH "Path to the NVidia DVP include directory." FORCE )
-  IF( MSVC AND ${CMAKE_GENERATOR} MATCHES "Win64" )
-    SET (NVIDIA_DVP_BINARY_DIR ${NVIDIA_DVP_BASE_DIR}/bin/x64 CACHE PATH "Directory containing NVidia DVP shared library file." FORCE)
-    SET (NVIDIA_DVP_LIB_DIR ${NVIDIA_DVP_BASE_DIR}/lib/x64 CACHE PATH "Directory containing NVidia DVP static library file." FORCE)
-  ELSE()
-    SET (NVIDIA_DVP_BINARY_DIR ${NVIDIA_DVP_BASE_DIR}/bin/win32 CACHE PATH "Directory containing NVidia DVP shared library file." FORCE)
-    SET (NVIDIA_DVP_LIB_DIR ${NVIDIA_DVP_BASE_DIR}/lib/win32 CACHE PATH "Directory containing NVidia DVP static library file." FORCE)
-  ENDIF()
-  MARK_AS_ADVANCED(NVIDIA_DVP_BASE_DIR
-    NVIDIA_DVP_INCLUDE_DIR
-    NVIDIA_DVP_BINARY_DIR
-    NVIDIA_DVP_LIB_DIR
-    )
-ENDIF()
-
 # --------------------------------------------------------------------------
 # Subdirs
 #

PlusLib/src/CMakeLists.txt

@@ -1,3 +1,5 @@
+
+
 # --------------------------------------------------------------------------
 # Try to find VTK and include its settings (otherwise complain)
 FIND_PACKAGE(VTK NO_MODULE REQUIRED PATHS ${VTK_DIR} NO_DEFAULT_PATH)
@@ -14,11 +16,13 @@ FIND_PACKAGE (ITK REQUIRED PATHS ${ITK_DIR} NO_DEFAULT_PATH)
 IF ( ITK_FOUND )
   INCLUDE( ${ITK_USE_FILE} )
 ELSE ( ITK_FOUND )
-  MESSAGE( FATAL_ERROR "This application requires ITK. One of these components is missing. Please verify configuration")
+    MESSAGE( FATAL_ERROR "This application requires ITK. One of these components is missing. Please verify configuration")
 ENDIF( ITK_FOUND )
 
+
 # --------------------------------------------------------------------------
 # Use OpenIGTLink protocol
+#
 OPTION(PLUS_USE_OpenIGTLink "Use the OpenIGTLink protocol" OFF)
 SET(PLUS_OPENIGTLINK_VERSION)
 IF(PLUS_USE_OpenIGTLink)
@@ -37,12 +41,13 @@ ENDIF(PLUS_USE_OpenIGTLink)
 # --------------------------------------------------------------------------
 # Options
 OPTION(BUILD_SHARED_LIBS "Build with shared libraries." ${VTK_BUILD_SHARED_LIBS} ${ITK_BUILD_SHARED_LIBS} )
+# OPTION (BUILD_SLICER_MODULE "Build project as Slicer module" OFF)
 
 # --------------------------------------------------------------------------
 # Use accurate or simple timer protocol
 #
 # DevPartnerStudio performance profiler hangs if the accurate timer
-# is used. If USE_SIMPLE_TIMER is defined then the accurate timer is
+# is used.If USE_SIMPLE_TIMER is defined then the accurate timer is
 # bypassed. It should only be enabled for performance profiling.
 
 OPTION(PLUS_USE_SIMPLE_TIMER "Use simple timer (not very accurate but more compatible with performance profilers)" OFF)
@@ -55,6 +60,7 @@ OPTION(PLUS_USE_INTEL_MKL "Use the Intel MKL library (only for image processing)
 
 # --------------------------------------------------------------------------
 # Configure output paths for libraries and executables.
+#
 IF(NOT DEFINED PLUS_EXECUTABLE_OUTPUT_PATH)
   SET(PLUS_EXECUTABLE_OUTPUT_PATH "${PlusLib_BINARY_DIR}/bin")
 ENDIF()
@@ -71,6 +77,7 @@ ENDIF()
 
 # --------------------------------------------------------------------------
 # Sikuli binary directory path.
+#
 SET(SIKULI_BIN_DIR ${PLUSLIB_TOOLS_DIR}/Sikuli/ CACHE PATH "Path to the Sikuli binary directory." FORCE)
 
 # --------------------------------------------------------------------------
@@ -84,6 +91,7 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH})
 
 # --------------------------------------------------------------------------
 # Command-line application documentation
+#
 
 # Create directory for the command-line application help files (they are generated by after build by running
 # each command-line tool with the --help parameter)
@@ -105,6 +113,7 @@ ENDMACRO(GENERATE_HELP_DOC)
 
 # --------------------------------------------------------------------------
 # Library export directive file generation
+#
 
 # This macro generates a ...Export.h file that specifies platform-specific DLL export directives,
 # for example on Windows: __declspec( dllexport )
@@ -120,6 +129,7 @@ ENDMACRO(GENERATE_EXPORT_DIRECTIVE_FILE)
 
 # --------------------------------------------------------------------------
 # Initialize variables that will be filled by makefiles in subdirectories
+#
 
 # PLUSLIB_DEPENDENCIES contain all the exported targets that will be
 # available to applications that use PlusLib
@@ -173,6 +183,7 @@ ADD_SUBDIRECTORY(PlusVolumeReconstruction)
 INCLUDE_DIRECTORIES( ${PlusVolumeReconstruction_INCLUDE_DIRS} )
 SET(PLUSLIB_INCLUDE_DIRS ${PLUSLIB_INCLUDE_DIRS} ${PlusVolumeReconstruction_INCLUDE_DIRS} CACHE INTERNAL "" )
 
+# PlusDataCollection
 ADD_SUBDIRECTORY(PlusDataCollection)
 INCLUDE_DIRECTORIES( ${PlusDataCollection_INCLUDE_DIRS} )
 SET(PLUSLIB_INCLUDE_DIRS ${PLUSLIB_INCLUDE_DIRS} ${PlusDataCollection_INCLUDE_DIRS} CACHE INTERNAL "" )
@@ -195,6 +206,7 @@ FILE(GLOB headers
 
 # --------------------------------------------------------------------------
 # Configure include file
+#
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/PlusConfigure.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/PlusConfigure.h
@@ -224,27 +236,6 @@ export(TARGETS
 # (this registers the build-tree with a global CMake-registry)
 export(PACKAGE PlusLib)
 
-#----------------------------------------------------------------------------
-# Append entries for export
-IF( ${PLUS_USE_EPIPHAN} )
-  LIST(APPEND PLUSLIB_DEPENDENCIES Epiphan)
-ENDIF()
-IF( ${PLUS_USE_Ascension3DG} )
-  LIST(APPEND PLUSLIB_DEPENDENCIES Ascension3DG)
-ENDIF()
-IF( ${PLUS_USE_Ascension3DGm} )
-  LIST(APPEND PLUSLIB_DEPENDENCIES Ascension3DGm)
-ENDIF()
-IF( ${PLUS_USE_PHIDGET_SPATIAL_TRACKER} )
-  LIST(APPEND PLUSLIB_DEPENDENCIES phidget)
-ENDIF()
-IF( ${PLUS_USE_BRACHY_TRACKER} )
-  LIST(APPEND PLUSLIB_DEPENDENCIES USDigitalEncoders)
-ENDIF()
-IF( ${PLUS_USE_NVIDIA_DVP} )
-  LIST(APPEND PLUSLIB_DEPENDENCIES NVidiaDVP)
-ENDIF()
-
 #-----------------------------------------------------------------------------
 # Re: #1075 eventually remove this section after people are used to the new location
 # Create a PlusConfig.cmake file for the use from the build tree
@@ -262,6 +253,7 @@ CONFIGURE_FILE(PlusLibConfigVersion.cmake.in
 
 #-----------------------------------------------------------------------------
 # Generate default application configuration files in the non-installed executable directories (Release and Debug too)
+#
 SET( PLUSCONFIG_DEVICESET_CONFIG_DIR "${PLUSLIB_DATA_DIR}/ConfigFiles" )
 SET( PLUSCONFIG_IMAGE_DIR "${PLUSLIB_DATA_DIR}/TestImages" )
 SET( PLUSCONFIG_MODEL_DIR "${PLUSLIB_DATA_DIR}/CADModels" )
@@ -287,6 +279,7 @@ ENDIF()
 
 #-----------------------------------------------------------------------------
 # Documentation
+#
 OPTION(BUILD_DOCUMENTATION "Build the documentation (Doxygen)." OFF)
 MARK_AS_ADVANCED(BUILD_DOCUMENTATION)
 
@@ -315,13 +308,32 @@ ENDIF(BUILD_DOCUMENTATION)
 
 ADD_SUBDIRECTORY(Documentation)
 
+#----------------------------------------------------------------------------
+# Append entries for export to UsePlusLib.cmake
+IF( ${PLUS_USE_EPIPHAN} )
+  LIST(APPEND PLUSLIB_DEPENDENCIES Epiphan)
+ENDIF()
+IF( ${PLUS_USE_Ascension3DG} )
+  LIST(APPEND PLUSLIB_DEPENDENCIES Ascension3DG)
+ENDIF()
+IF( ${PLUS_USE_Ascension3DGm} )
+  LIST(APPEND PLUSLIB_DEPENDENCIES Ascension3DGm)
+ENDIF()
+IF( ${PLUS_USE_PHIDGET_SPATIAL_TRACKER} )
+  LIST(APPEND PLUSLIB_DEPENDENCIES phidget)
+ENDIF()
+IF( ${PLUS_USE_BRACHY_TRACKER} )
+  LIST(APPEND PLUSLIB_DEPENDENCIES USDigitalEncoders)
+ENDIF()
+
 #-----------------------------------------------------------------------------
 # Generate include file for projects that use this library
+#
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/UsePlusLib.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/UsePlusLib.cmake @ONLY)
 
-#-----------------------------------------------------------------------------
+  #-----------------------------------------------------------------------------
 # With regards to ticket #1075, also generate in top-level directory
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/UsePlusLib.cmake.in

PlusLib/src/PlusConfigure.h.in

@@ -99,7 +99,6 @@
 #cmakedefine PLUS_USE_tesseract
 #cmakedefine PLUS_TEST_tesseract
 #cmakedefine PLUS_USE_USDIGITALENCODERS_TRACKER
-#cmakedefine PLUS_USE_NVIDIA_DVP
 
 #cmakedefine PLUS_USE_SIMPLE_TIMER
 #cmakedefine PLUS_TEST_HIGH_ACCURACY_TIMING