From 5c2d4417f407ad2a974c6b21817a673f406eccd8 Mon Sep 17 00:00:00 2001 From: Kyle Sunderland Date: Fri, 17 Nov 2017 15:00:42 -0500 Subject: [PATCH 1/5] Updated Plus stable branches and tags for version 2.6 --- CMakeLists.txt | 6 +++--- SuperBuild/External_OpenIGTLink.cmake | 2 +- SuperBuild/External_OpenIGTLinkIO.cmake | 2 +- SuperBuild/External_OvrvisionPro.cmake | 2 +- SuperBuild/External_Tesseract.cmake | 4 ++-- SuperBuild/External_aruco.cmake | 2 +- SuperBuild/External_ndicapi.cmake | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2f182885..20bde7611 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,18 +283,18 @@ ENDIF() #----------------------------------------------------------------------------- SET(PLUSLIB_GIT_REPOSITORY "${GIT_PROTOCOL}://github.com/PlusToolkit/PlusLib.git" CACHE STRING "Set PlusLib desired git url") MARK_AS_ADVANCED(PLUSLIB_GIT_REPOSITORY) -SET(PLUSLIB_GIT_REVISION "master" CACHE STRING "Set PlusLib desired git hash (master means latest)") +SET(PLUSLIB_GIT_REVISION "Plus-2.6" CACHE STRING "Set PlusLib desired git hash (master means latest)") MARK_AS_ADVANCED(PLUSLIB_GIT_REVISION) SET(PLUSAPP_GIT_REPOSITORY "${GIT_PROTOCOL}://github.com/PlusToolkit/PlusApp.git" CACHE STRING "Set PlusApp desired git url") MARK_AS_ADVANCED(PLUSAPP_GIT_REPOSITORY) -SET(PLUSAPP_GIT_REVISION "master" CACHE STRING "Set PlusApp desired git hash (master means latest)") +SET(PLUSAPP_GIT_REVISION "Plus-2.6" CACHE STRING "Set PlusApp desired git hash (master means latest)") MARK_AS_ADVANCED(PLUSAPP_GIT_REVISION) IF(PLUSBUILD_DOWNLOAD_PLUSLIBDATA) SET(PLUSBUILD_PLUSLIBDATA_GIT_REPOSITORY "${GIT_PROTOCOL}://github.com/PlusToolkit/PlusLibData.git" CACHE STRING "Set PlusLibData desired git url.") MARK_AS_ADVANCED(PLUSBUILD_PLUSLIBDATA_GIT_REPOSITORY) - SET(PLUSBUILD_PLUSLIBDATA_GIT_REVISION "master" CACHE STRING "Set PlusLibData desired git hash (master means latest).") + SET(PLUSBUILD_PLUSLIBDATA_GIT_REVISION "Plus-2.6" CACHE STRING "Set PlusLibData desired git hash (master means latest).") MARK_AS_ADVANCED(PLUSBUILD_PLUSLIBDATA_GIT_REVISION) ENDIF() diff --git a/SuperBuild/External_OpenIGTLink.cmake b/SuperBuild/External_OpenIGTLink.cmake index a32afdd59..08d3817ee 100644 --- a/SuperBuild/External_OpenIGTLink.cmake +++ b/SuperBuild/External_OpenIGTLink.cmake @@ -33,7 +33,7 @@ ELSE() SetGitRepositoryTag( OpenIGTLink "${GIT_PROTOCOL}://github.com/openigtlink/OpenIGTLink.git" - "master" + "63d0a14ba8d7e1fce0d2b813e6b33a4e4f196486" ) SET (PLUS_OpenIGTLink_SRC_DIR "${CMAKE_BINARY_DIR}/Deps/OpenIGTLink") diff --git a/SuperBuild/External_OpenIGTLinkIO.cmake b/SuperBuild/External_OpenIGTLinkIO.cmake index d377a4d41..61144f0d8 100644 --- a/SuperBuild/External_OpenIGTLinkIO.cmake +++ b/SuperBuild/External_OpenIGTLinkIO.cmake @@ -30,7 +30,7 @@ ELSE() SetGitRepositoryTag( OpenIGTLinkIO "${GIT_PROTOCOL}://github.com/IGSIO/OpenIGTLinkIO.git" - "master" + "577bfedd66d720413ea380ca764471d908c9476b" ) SET (PLUS_OpenIGTLinkIO_SRC_DIR "${CMAKE_BINARY_DIR}/Deps/OpenIGTLinkIO") diff --git a/SuperBuild/External_OvrvisionPro.cmake b/SuperBuild/External_OvrvisionPro.cmake index c7d65870d..629d500c8 100644 --- a/SuperBuild/External_OvrvisionPro.cmake +++ b/SuperBuild/External_OvrvisionPro.cmake @@ -53,7 +53,7 @@ ELSE() SetGitRepositoryTag( OvrvisionPro "${GIT_PROTOCOL}://github.com/PLUSToolkit/OvrvisionProCMake.git" - "master" + "dc53f9cc29dd0a566a08648f4ac2914b9d555c72" ) ExternalProject_Add( OvrvisionPro diff --git a/SuperBuild/External_Tesseract.cmake b/SuperBuild/External_Tesseract.cmake index 5119f9ef3..1b1cf1971 100644 --- a/SuperBuild/External_Tesseract.cmake +++ b/SuperBuild/External_Tesseract.cmake @@ -7,7 +7,7 @@ SET(tesseract_ROOT_DIR ${CMAKE_BINARY_DIR}/Deps) SetGitRepositoryTag( leptonica "${GIT_PROTOCOL}://github.com/PLUSToolkit/leptonica.git" - "master" + "3130874380fcc2b0268d4f57863cbacdf9d1e9a4" ) IF(leptonica_DIR) @@ -46,7 +46,7 @@ ENDIF() SetGitRepositoryTag( tessdata "${GIT_PROTOCOL}://github.com/PLUSToolkit/tessdata.git" - "master" + "436f296294e97e01a2fbcd0744edf8577c491a8d" ) IF(tessdata_DIR) diff --git a/SuperBuild/External_aruco.cmake b/SuperBuild/External_aruco.cmake index c91689262..dfcdc3634 100644 --- a/SuperBuild/External_aruco.cmake +++ b/SuperBuild/External_aruco.cmake @@ -38,7 +38,7 @@ ELSE() SetGitRepositoryTag( aruco "${GIT_PROTOCOL}://github.com/PlusToolkit/aruco.git" - "master" + "4174b230966d2ce2bc000ddff5fb3e97e1fd721f" ) SET (PLUS_aruco_src_DIR ${CMAKE_BINARY_DIR}/Deps/aruco CACHE INTERNAL "Path to store aruco contents") diff --git a/SuperBuild/External_ndicapi.cmake b/SuperBuild/External_ndicapi.cmake index 8ccbec243..eaabae168 100644 --- a/SuperBuild/External_ndicapi.cmake +++ b/SuperBuild/External_ndicapi.cmake @@ -32,7 +32,7 @@ ELSE() SetGitRepositoryTag( ndicapi "${GIT_PROTOCOL}://github.com/PlusToolkit/ndicapi.git" - "master" + "f1bf6d55f8fa61105dc219ab09ee706cfecc0564" ) # -------------------------------------------------------------------------- From 3129ba6a90550534cea3fa0a34ad99083954a058 Mon Sep 17 00:00:00 2001 From: Kyle Sunderland Date: Wed, 29 Nov 2017 12:17:43 -0500 Subject: [PATCH 2/5] Update FindMotiveAPI to correctly set the library and binary dir --- Modules/FindMotiveAPI.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Modules/FindMotiveAPI.cmake b/Modules/FindMotiveAPI.cmake index 831918441..6f59b69fe 100644 --- a/Modules/FindMotiveAPI.cmake +++ b/Modules/FindMotiveAPI.cmake @@ -15,14 +15,14 @@ # MOTIVE_OPENMP_DIR Location of libiomp5md.dll needed to use Motive API SET(MOTIVEAPI_PATH_HINTS - "$ENV{PROGRAMFILES}/OptiTrack/Motive" - "$ENV{PROGRAMW6432}/OptiTrack/Motive" - "C:/Program Files (x86)/OptiTrack/Motive" - "C:/Program Files/OptiTrack/Motive" "../PLTools/OptiTrack/MotiveAPI-1.10.3" "../../PLTools/OptiTrack/MotiveAPI-1.10.3" "../trunk/PLTools/OptiTrack/MotiveAPI-1.10.3" "${CMAKE_CURRENT_BINARY_DIR}/PLTools/OptiTrack/MotiveAPI-1.10.3" + "$ENV{PROGRAMFILES}/OptiTrack/Motive" + "$ENV{PROGRAMW6432}/OptiTrack/Motive" + "C:/Program Files (x86)/OptiTrack/Motive" + "C:/Program Files/OptiTrack/Motive" ) find_path(MOTIVE_DIR "/inc/NPTrackingTools.h" @@ -35,19 +35,19 @@ IF (MOTIVE_DIR) mark_as_advanced(MOTIVE_API_INCLUDE_DIR) # Libraries - SET(LIB_NAME_SUFFIX "") + SET(PLATFORM_NAME_SUFFIX "") SET(OPENMP_PATH_SUFFIX "/lib32") IF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) - SET(LIB_NAME_SUFFIX "x64") + SET(PLATFORM_NAME_SUFFIX "x64") SET(OPENMP_PATH_SUFFIX "") ENDIF () find_path(MotiveAPI_LIBRARY_DIR - NAMES NPTrackingTools${PLATFORM_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} + NAMES NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} PATHS "${MOTIVE_DIR}/lib/" NO_DEFAULT_PATH) find_path(MotiveAPI_BINARY_DIR - NAMES NPTrackingTools${PLATFORM_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} + NAMES NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} PATHS "${MOTIVE_DIR}/lib/" NO_DEFAULT_PATH) find_path(libiomp_LIBRARY_DIR @@ -56,8 +56,8 @@ IF (MOTIVE_DIR) set(MOTIVE_API_LIBRARY_DIR ${MotiveAPI_LIBRARY_DIR}) set(MOTIVE_API_BINARY_DIR ${MotiveAPI_BINARY_DIR}) - set(MOTIVE_API_LIBRARY_NAME NPTrackingTools${LIB_NAME_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(MOTIVE_API_BINARY_NAME NPTrackingTools${LIB_NAME_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(MOTIVE_API_LIBRARY_NAME NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) + set(MOTIVE_API_BINARY_NAME NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) set(MOTIVE_OPENMP_DIR ${libiomp_LIBRARY_DIR}) mark_as_advanced(MOTIVE_API_LIBRARY_DIR) From c86ca61d489bb0f59ecb6432bb99fa3881ce11fd Mon Sep 17 00:00:00 2001 From: Sunderlandkyl Date: Sat, 20 Jan 2018 14:29:14 -0500 Subject: [PATCH 3/5] Add MSVC80 OpenMP dll to OptiTrack 32-bit builds --- Modules/FindMotiveAPI.cmake | 26 ++++++++++++++++++++------ SuperBuild/External_PlusLib.cmake | 1 + 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Modules/FindMotiveAPI.cmake b/Modules/FindMotiveAPI.cmake index 6f59b69fe..463388889 100644 --- a/Modules/FindMotiveAPI.cmake +++ b/Modules/FindMotiveAPI.cmake @@ -25,6 +25,13 @@ SET(MOTIVEAPI_PATH_HINTS "C:/Program Files/OptiTrack/Motive" ) +SET(Microsoft_VC80_OpenMP_PATH_HINTS + "../PLTools/OptiTrack/Microsoft.VC80.OpenMP" + "../../PLTools/OptiTrack/Microsoft.VC80.OpenMP" + "../trunk/PLTools/OptiTrack/Microsoft.VC80.OpenMP" + "${CMAKE_CURRENT_BINARY_DIR}/PLTools/OptiTrack/Microsoft.VC80.OpenMP" + ) + find_path(MOTIVE_DIR "/inc/NPTrackingTools.h" PATHS ${MOTIVEAPI_PATH_HINTS} DOC "OptiTrack Motive API directory") @@ -40,8 +47,13 @@ IF (MOTIVE_DIR) IF (CMAKE_HOST_WIN32 AND CMAKE_CL_64 ) SET(PLATFORM_NAME_SUFFIX "x64") SET(OPENMP_PATH_SUFFIX "") + ELSE() + find_path(MSVC80_OpenMP_DIR + NAMES vcomp.dll + PATHS ${Microsoft_VC80_OpenMP_PATH_HINTS} + DOC "Microsoft VC80 OpenMP directory") ENDIF () - + find_path(MotiveAPI_LIBRARY_DIR NAMES NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX} PATHS "${MOTIVE_DIR}/lib/" NO_DEFAULT_PATH) @@ -50,21 +62,23 @@ IF (MOTIVE_DIR) NAMES NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} PATHS "${MOTIVE_DIR}/lib/" NO_DEFAULT_PATH) - find_path(libiomp_LIBRARY_DIR - NAMES libiomp5md${CMAKE_SHARED_LIBRARY_SUFFIX} - PATHS "${MOTIVE_DIR}${OPENMP_PATH_SUFFIX}" NO_DEFAULT_PATH) - + find_path(libiomp_LIBRARY_DIR + NAMES libiomp5md${CMAKE_SHARED_LIBRARY_SUFFIX} + PATHS "${MOTIVE_DIR}${OPENMP_PATH_SUFFIX}" NO_DEFAULT_PATH) + set(MOTIVE_API_LIBRARY_DIR ${MotiveAPI_LIBRARY_DIR}) set(MOTIVE_API_BINARY_DIR ${MotiveAPI_BINARY_DIR}) set(MOTIVE_API_LIBRARY_NAME NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) set(MOTIVE_API_BINARY_NAME NPTrackingTools${PLATFORM_NAME_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) set(MOTIVE_OPENMP_DIR ${libiomp_LIBRARY_DIR}) - + set(MOTIVE_MSVC80_OPENMP_DIR ${MSVC80_OpenMP_DIR}) + mark_as_advanced(MOTIVE_API_LIBRARY_DIR) mark_as_advanced(MOTIVE_API_BINARY_DIR) mark_as_advanced(MOTIVE_API_LIBRARY_NAME) mark_as_advanced(MOTIVE_API_BINARY_NAME) mark_as_advanced(MOTIVE_OPENMP_DIR) + mark_as_advanced(MOTIVE_MSVC80_OPENMP_DIR) #Version #TODO: properly set SDK version using REGEX diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index 1c3dd46aa..609c52069 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -83,6 +83,7 @@ IF(PLUS_USE_OPTITRACK) -DOPTITRACK_NATNET_BINARY_DIR:PATH=${NATNET_SDK_BINARY_DIR} -DOPTITRACK_OPENMP_DIR:PATH=${MOTIVE_OPENMP_DIR} + -DOPTITRACK_MSVC80_OPENMP_DIR:PATH=${MOTIVE_MSVC80_OPENMP_DIR} ) ENDIF() From 8159839b8cc80cb90e917c24c3aae13d571f1290 Mon Sep 17 00:00:00 2001 From: Ole Vegard Solberg Date: Mon, 9 Apr 2018 14:51:16 +0200 Subject: [PATCH 4/5] Reducing required CMake version for ndicapi allows Plus-2.6 to compile on Ubuntu 16.04 with ndi support --- SuperBuild/External_ndicapi.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SuperBuild/External_ndicapi.cmake b/SuperBuild/External_ndicapi.cmake index eaabae168..1617d0fb3 100644 --- a/SuperBuild/External_ndicapi.cmake +++ b/SuperBuild/External_ndicapi.cmake @@ -32,7 +32,7 @@ ELSE() SetGitRepositoryTag( ndicapi "${GIT_PROTOCOL}://github.com/PlusToolkit/ndicapi.git" - "f1bf6d55f8fa61105dc219ab09ee706cfecc0564" + "c79aec212c0793c3cb0cfb3acd6435ff2ac4cdc1" ) # -------------------------------------------------------------------------- @@ -57,8 +57,8 @@ ELSE() -DBUILD_SHARED_LIBS:BOOL=${PLUSBUILD_BUILD_SHARED_LIBS} -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} - #--Build step----------------- + -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY} + #--Build step----------------- BUILD_ALWAYS 1 #--Override install step----------------- INSTALL_COMMAND "" # Do not install From 7bb441e1c3dca7026cbc3a01f6b485e15fb53bb9 Mon Sep 17 00:00:00 2001 From: Sunderlandkyl Date: Tue, 7 May 2019 08:50:08 -0400 Subject: [PATCH 5/5] Update OpenIGTLink to support CMake >= 3.10.0 --- SuperBuild/External_OpenIGTLink.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/External_OpenIGTLink.cmake b/SuperBuild/External_OpenIGTLink.cmake index 08d3817ee..1ea720b35 100644 --- a/SuperBuild/External_OpenIGTLink.cmake +++ b/SuperBuild/External_OpenIGTLink.cmake @@ -32,8 +32,8 @@ ELSE() # OpenIGTLink has not been built yet, so download and build it as an external project SetGitRepositoryTag( OpenIGTLink - "${GIT_PROTOCOL}://github.com/openigtlink/OpenIGTLink.git" - "63d0a14ba8d7e1fce0d2b813e6b33a4e4f196486" + "${GIT_PROTOCOL}://github.com/Sunderlandkyl/OpenIGTLink.git" + "01cbcb083780ad46bfe2ffabd8e0128053e0f6c6" ) SET (PLUS_OpenIGTLink_SRC_DIR "${CMAKE_BINARY_DIR}/Deps/OpenIGTLink")