Skip to content

Commit

Permalink
STYLE: Trim trailing whitespace
Browse files Browse the repository at this point in the history
From https://stackoverflow.com/a/57334826 Using Visual Studio Code: 1. Open the root folder in your editor (I use Visual Studio Code). 2. Tap the Search icon on the left, and enable the regular expression mode. 3. Enter " +\n" in the Search bar and "\n" in the Replace bar. 4. Click "Replace All".
  • Loading branch information
jamesobutler authored and lassoan committed Nov 30, 2022
1 parent 937a130 commit 7c2d7ed
Show file tree
Hide file tree
Showing 38 changed files with 164 additions and 164 deletions.
8 changes: 4 additions & 4 deletions BuildAndTest.bat.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ IF NOT "%1"=="" (
GOTO :loop
)

SET DIRCMD=0
SET DIRCMD=0

if "%TEST_MODE%" == "" goto experimental
if "%TEST_MODE%" == "-E" goto experimental
Expand All @@ -44,8 +44,8 @@ goto END
timeout /t 15
goto END

:individual
@REM Run individual tests with regexp search
:individual
@REM Run individual tests with regexp search
@REM Display the list of tests
"${CMAKE_CTEST_COMMAND}" -R "%INDIVIDUAL_TEST%" -N
@REM Run selected tests
Expand All @@ -54,7 +54,7 @@ goto END

:BUILDFAILED
ECHO ERROR: Build failed...
GOTO END
GOTO END

:END
SET PATH=%ORIGPATH%
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ OPTION(PLUS_USE_ANDOR_CAMERA "Provide support for the Andor cameras capture stre

# ---------- Tracking Hardware ------------
OPTION(PLUS_USE_OPTITRACK "Provide support for the OptiTrack tracking system" OFF)
IF (PLUS_USE_OPTITRACK)
IF (PLUS_USE_OPTITRACK)
IF(NOT BUILD_ARCHITECTURE MATCHES "x64")
SET(MOTIVE_VERSION_DEFAULT "1.10.3")
ELSE()
Expand Down Expand Up @@ -316,7 +316,7 @@ OPTION(PLUS_USE_LEAPMOTION "Provide support for the LeapMotion hand tracker" OFF
IF(PLUS_USE_LEAPMOTION)
OPTION(PLUS_TEST_LEAPMOTION "Enable testing of LeapMotion device" OFF)
FIND_PACKAGE(LeapSDK 4.0 REQUIRED
PATHS
PATHS
../VASSTTools/LeapMotion/LeapSDK/lib/cmake/LeapSDK # Convenience for members of the VASST lab
)
ENDIF()
Expand Down Expand Up @@ -554,7 +554,7 @@ ENDIF()
IF (PLUS_USE_ANDOR_CAMERA AND NOT PLUSBUILD_USE_OpenCV)
MESSAGE("PLUSE_USE_ANDOR_CAMERA requires openCV option enabled, enabling.")
SET(PLUSBUILD_USE_OpenCV ON CACHE BOOL "Use OpenCV for optical marker tracking and other features." FORCE)
ENDIF()
ENDIF()
#--- END ANDOR dependency on opencv

# OpenCV dependency, MUST COME AFTER VTK external inclusion
Expand Down
4 changes: 2 additions & 2 deletions Docs/BuildInstructionsLinux.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Build Process

Troubleshooting
---------------

- "GLintptr has not been declared"
- Solution: In the vtkxOpenGLRenderWindow.cxx uncomment "#define GLX_GLXEXT_LEGACY"
- "Dunno about this gcc" error from Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
Expand All @@ -80,4 +80,4 @@ Ubuntu 14.04 LTS
================
This version of Ubuntu is not officially supported
- The gcc compiler provided by default (4.8.4) does not fully support c++11 and is missing functionality used by PlusLib
- The default version of Qt provided with the distribution (5.2.1) lacks some functionality required by PlusApp.
- The default version of Qt provided with the distribution (5.2.1) lacks some functionality required by PlusApp.
16 changes: 8 additions & 8 deletions Modules/FindAgilentMD1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,35 @@ IF(CMAKE_HOST_WIN32 AND CMAKE_CL_64)
ELSE()
SET(PLATFORM_SUFFIX "")
ENDIF()

FIND_PATH(AgilentMD1_INCLUDE_DIR AgMD1Fundamental.h
PATH_SUFFIXES
include
DOC "U10xx_Digitizers include directory (contains AgMD1Fundamental.h)"
PATHS ${AgilentMD1_PATH_HINTS}
PATHS ${AgilentMD1_PATH_HINTS}
)

FIND_LIBRARY(AgilentMD1_LIBRARY
FIND_LIBRARY(AgilentMD1_LIBRARY
NAMES AgMD1Fundamental${PLATFORM_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
PATH_SUFFIXES
lib
DOC "Path to Agilent MD1 base library (AgMD1Fundamental${CMAKE_STATIC_LIBRARY_SUFFIX})"
PATHS ${AgilentMD1_PATH_HINTS}
)

FIND_PATH(AgilentMD1_BINARY_DIR
FIND_PATH(AgilentMD1_BINARY_DIR
AgMD1Fundamental${PLATFORM_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}
PATH_SUFFIXES
PATH_SUFFIXES
bin
PATHS ${AgilentMD1_PATH_HINTS}
PATHS ${AgilentMD1_PATH_HINTS}
DOC "Path to Agilent MD1 base shared library (AgMD1Fundamental${CMAKE_SHARED_LIBRARY_SUFFIX})"
NO_DEFAULT_PATH # avoid finding installed DLLs in the system folders
)

# handle the QUIETLY and REQUIRED arguments and set MicronTracker_FOUND to TRUE if
# handle the QUIETLY and REQUIRED arguments and set MicronTracker_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(AgilentMD1 DEFAULT_MSG
FIND_PACKAGE_HANDLE_STANDARD_ARGS(AgilentMD1 DEFAULT_MSG
AgilentMD1_INCLUDE_DIR
AgilentMD1_LIBRARY
AgilentMD1_BINARY_DIR
Expand Down
6 changes: 3 additions & 3 deletions Modules/FindAndor.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ SET( ANDOR_PATH_HINTS
FIND_PATH(ANDOR_INCLUDE_DIR ATMCD32D.h
DOC "ANDOR include directory (contains ATMCD32D.h)"
PATHS ${ANDOR_PATH_HINTS}
)
)

if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(bitness 64)
if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
set(bitness 64)
else()
set(bitness 32)
endif()
Expand Down
10 changes: 5 additions & 5 deletions Modules/FindAtracsys.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,17 @@ IF(ATRACSYS_SDK_DIR)
ELSE()
SET(_BitnessSuffix "32")
ENDIF()

# Library
FIND_LIBRARY(AtracsysSDK_LIBRARY
NAMES fusionTrack${_BitnessSuffix}${CMAKE_STATIC_LIBRARY_SUFFIX}
PATHS "${ATRACSYS_SDK_DIR}/lib" NO_DEFAULT_PATH)

# Binaries
FIND_PATH(AtracsysSDK_BINARY_DIR
NAMES fusionTrack${_BitnessSuffix}${CMAKE_SHARED_LIBRARY_SUFFIX}
PATHS "${ATRACSYS_SDK_DIR}/bin" NO_DEFAULT_PATH)

ELSE()
# No static library
SET(AtracsysSDK_LIBRARY "")
Expand All @@ -112,7 +112,7 @@ IF(ATRACSYS_SDK_DIR)
MARK_AS_ADVANCED(AtracsysSDK_LIBRARY)
SET(ATRACSYS_SDK_BINARY_DIR ${AtracsysSDK_BINARY_DIR})
MARK_AS_ADVANCED(AtracsysSDK_BINARY_DIR)

#Version
#TODO: properly set SDK version using regex
set(ATRACSYS_SDK_VERSION "3.1.1")
Expand All @@ -122,6 +122,6 @@ ENDIF()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ATRACSYS_SDK
FOUND_VAR ATRACSYS_SDK_FOUND
REQUIRED_VARS ATRACSYS_DEVICE_TYPE ATRACSYS_SDK_INCLUDE_DIR ATRACSYS_SDK_BINARY_DIR #ATRACSYS_SDK_LIBRARY
REQUIRED_VARS ATRACSYS_DEVICE_TYPE ATRACSYS_SDK_INCLUDE_DIR ATRACSYS_SDK_BINARY_DIR #ATRACSYS_SDK_LIBRARY
VERSION_VAR ATRACSYS_SDK_VERSION
)
2 changes: 1 addition & 1 deletion Modules/FindClariusOEM.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ENDIF()


IF(ClariusOEM_DIR)

# set path to Clarius OEM SDK include directory
SET(ClariusOEM_INCLUDE_DIRS ${ClariusOEM_DIR}/include/oem CACHE PATH "Clarius OEM SDK include directories")
MARK_AS_ADVANCED(ClariusOEM_INCLUDE_DIRS)
Expand Down
22 changes: 11 additions & 11 deletions Modules/FindDeckLinkSDK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ UNSET(DeckLinkSDK_PATH)
FIND_FILE(_header_found
${__include_file}
PATHS ${DECKLINK_SDK_ROOT}
$ENV{DECKLINK_SDK_DIR}
$ENV{BLACKMAGIC_SDK_DIR}
$ENV{DECKLINK_DIR}
$ENV{DECKLINK_SDK_DIR}
$ENV{BLACKMAGIC_SDK_DIR}
$ENV{DECKLINK_DIR}
$ENV{BLACKMAGIC_DIR}
# Plus specific paths to check
"../../VASSTTools/BlackmagicDeckLinkSDK-11.2"
Expand Down Expand Up @@ -151,17 +151,17 @@ IF(NOT TARGET DeckLinkSDK)
IMPORTED_LOCATION "${DeckLinkSDK_PATH}/${_platform}/NVIDIA_GPUDirect/bin/${BUILD_ARCHITECTURE}/dvp.dll"
INTERFACE_INCLUDE_DIRECTORIES "${DeckLinkSDK_PATH}/${_platform}/NVIDIA_GPUDirect/include"
)
set_target_properties(DeckLinkSDK
PROPERTIES

set_target_properties(DeckLinkSDK
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"${DeckLinkSDK_PATH}/${_platform}/include;${DeckLinkSDK_PATH}/${_platform}/DirectShow/include"
)
SET(DeckLinkSDK_LIBS DeckLinkSDK NVIDIA_GPUDirect)
ENDIF()
ELSE()
set_target_properties(DeckLinkSDK
PROPERTIES
set_target_properties(DeckLinkSDK
PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES
"${DeckLinkSDK_PATH}/${_platform}/include"
)
Expand All @@ -172,14 +172,14 @@ IF(NOT TARGET DeckLinkSDK)
IMPORTED_LOCATION "${DeckLinkSDK_PATH}/${_platform}/NVIDIA_GPUDirect/${BUILD_ARCHITECTURE}/libdvp.so"
INTERFACE_INCLUDE_DIRECTORIES "${DeckLinkSDK_PATH}/${_platform}/NVIDIA_GPUDirect/include"
)
set_target_properties(DeckLinkSDK
set_target_properties(DeckLinkSDK
PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES
IMPORTED_LINK_INTERFACE_LIBRARIES
NVIDIA_GPUDirect
)
SET(DeckLinkSDK_LIBS DeckLinkSDK NVIDIA_GPUDirect)
ELSE()
set_target_properties(DeckLinkSDK
set_target_properties(DeckLinkSDK
PROPERTIES
)
SET(DeckLinkSDK_LIBS DeckLinkSDK CoreFoundation)
Expand Down
8 changes: 4 additions & 4 deletions Modules/FindFFMPEG.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ MACRO(FFMPEG_FIND varname shortname headername)
ENDIF()
ENDFOREACH()
ELSEIF(UNIX AND NOT APPLE)

ELSEIF(APPLE)

ENDIF()
ENDIF()

Expand Down Expand Up @@ -162,10 +162,10 @@ LIST(REMOVE_DUPLICATES FFMPEG_TARGETS)
SET(FFMPEG_TARGETS ${FFMPEG_TARGETS} CACHE STRING "Names of the ffmpeg:: targets.")
MARK_AS_ADVANCED(FFMPEG_TARGETS)

# handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE if
# handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFMPEG
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFMPEG
FAIL_MESSAGE "Unable to locate FFMPEG. Please set FFMPEG_ROOT to a valid location."
REQUIRED_VARS FFMPEG_INCLUDE_DIRS FFMPEG_LIBRARIES
)
22 changes: 11 additions & 11 deletions Modules/FindInterson.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# INTERSON_WIN32_BINARY_DIR - 32-bit shared libraries to be installed
# INTERSON_WIN64_BINARY_DIR - 64-bit shared libraries to be installed

SET( Interson_PATH_HINTS
SET( Interson_PATH_HINTS
../PLTools/Interson/iSDK2012_4.83.4363
../../PLTools/Interson/iSDK2012_4.83.4363
../trunk/PLTools/Interson/iSDK2012_4.83.4363
Expand All @@ -19,44 +19,44 @@ FIND_PATH(Interson_INCLUDE_DIR usbProbeDLL_net.h
PATH_SUFFIXES
"include"
DOC "Interson include directory (contains usbProbeDLL_net.h)"
PATHS ${Interson_PATH_HINTS}
PATHS ${Interson_PATH_HINTS}
)

FIND_PATH(Interson_LIBRARY_DIR USBprobeDLL${CMAKE_STATIC_LIBRARY_SUFFIX}
PATH_SUFFIXES
"lib"
DOC "Interson library directory (contains USBprobeDLL.lib)"
PATHS ${Interson_PATH_HINTS}
PATHS ${Interson_PATH_HINTS}
)

FIND_PATH(Interson_BINARY_DIR BmodeUSB${CMAKE_SHARED_LIBRARY_SUFFIX}
PATH_SUFFIXES
PATH_SUFFIXES
"lib"
DOC "Path to Interson common binary directory (contains BmodeUSB.dll)"
PATHS ${Interson_PATH_HINTS}
NO_DEFAULT_PATH # avoid finding installed DLLs in the system folders
)

FIND_PATH(Interson_WIN32_BINARY_DIR USBprobe${CMAKE_SHARED_LIBRARY_SUFFIX}
PATH_SUFFIXES
PATH_SUFFIXES
"lib/32bit"
DOC "Path to Interson 32-bit binary directory (contains 32-bit USBprobe.dll)"
PATHS ${Interson_PATH_HINTS}
NO_DEFAULT_PATH # avoid finding installed DLLs in the system folders
)

FIND_PATH(Interson_WIN64_BINARY_DIR USBprobe${CMAKE_SHARED_LIBRARY_SUFFIX}
PATH_SUFFIXES
PATH_SUFFIXES
"lib/64bit"
DOC "Path to Interson 64-bit binary directory (contains 64-bit USBprobe.dll)"
PATHS ${Interson_PATH_HINTS}
NO_DEFAULT_PATH # avoid finding installed DLLs in the system folders
)
)

# handle the QUIETLY and REQUIRED arguments and set Interson_FOUND to TRUE if
# handle the QUIETLY and REQUIRED arguments and set Interson_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Interson DEFAULT_MSG
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Interson DEFAULT_MSG
Interson_LIBRARY_DIR
Interson_INCLUDE_DIR
Interson_BINARY_DIR
Expand Down
6 changes: 3 additions & 3 deletions Modules/FindIntuitiveDaVinci.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This module defines
#

SET(IntuitiveDaVinci_SDK_PATH_HINTS
SET(IntuitiveDaVinci_SDK_PATH_HINTS
../IntuitiveDaVinci
../PLTools/IntuitiveDaVinci
../../PLTools/IntuitiveDaVinci
Expand All @@ -22,12 +22,12 @@ FIND_LIBRARY(IntuitiveDaVinci_LIBRARY
DOC "Library file for ISI API"
)

# handle the QUIETLY and REQUIRED arguments and set ISIAPI_FOUND to TRUE if
# handle the QUIETLY and REQUIRED arguments and set ISIAPI_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IntuitiveDaVinci DEFAULT_MSG IntuitiveDaVinci_LIBRARY IntuitiveDaVinci_INCLUDE_DIR )

SET(IntuitiveDaVinci_FOUND ${INTUITIVEDAVINCI_FOUND})
SET(IntuitiveDaVinci_FOUND ${INTUITIVEDAVINCI_FOUND})
IF(IntuitiveDaVinci_FOUND)
SET( IntuitiveDaVinci_LIBRARY ${IntuitiveDaVinci_LIBRARY} )
SET( IntuitiveDaVinci_INCLUDE_DIR ${IntuitiveDaVinci_INCLUDE_DIR} )
Expand Down
4 changes: 2 additions & 2 deletions Modules/FindK4A.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Find the Azure Kinect SDK
# Find the Azure Kinect SDK
# This module defines
# K4A_FOUND - Azure Kinect SDK has been found on this system
# K4A_INCLUDE_DIR - Azure Kinect SDK headers directory
Expand Down Expand Up @@ -66,7 +66,7 @@ ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF()

INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(K4A DEFAULT_MSG
FIND_PACKAGE_HANDLE_STANDARD_ARGS(K4A DEFAULT_MSG
K4A_INCLUDE_DIR
K4A_LIBRARY_DIR
K4A_BINARY_DIR
Expand Down
Loading

0 comments on commit 7c2d7ed

Please sign in to comment.