From 038fec176d3de6c7934005ce242013e34e8f71fb Mon Sep 17 00:00:00 2001 From: Kyle Sunderland Date: Mon, 14 Jan 2019 17:00:32 -0500 Subject: [PATCH 1/8] Update Plus stable branches and tags for version 2.8 --- CMakeLists.txt | 6 +++--- SuperBuild/External_IGSIO.cmake | 2 +- SuperBuild/External_InfraredSeekCam.cmake | 2 +- SuperBuild/External_OpenIGTLink.cmake | 2 +- SuperBuild/External_OpenIGTLinkIO.cmake | 2 +- SuperBuild/External_OvrvisionPro.cmake | 2 +- SuperBuild/External_PlusModelCatalog.cmake | 2 +- SuperBuild/External_Tesseract.cmake | 4 ++-- SuperBuild/External_aruco.cmake | 2 +- SuperBuild/External_libwebm.cmake | 2 +- SuperBuild/External_ndicapi.cmake | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7947f1ed..cdb5ad6aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,18 +312,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.8" 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.8" 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.8" CACHE STRING "Set PlusLibData desired git hash (master means latest).") MARK_AS_ADVANCED(PLUSBUILD_PLUSLIBDATA_GIT_REVISION) ENDIF() diff --git a/SuperBuild/External_IGSIO.cmake b/SuperBuild/External_IGSIO.cmake index e9a576b60..292609370 100644 --- a/SuperBuild/External_IGSIO.cmake +++ b/SuperBuild/External_IGSIO.cmake @@ -12,7 +12,7 @@ ELSE() SetGitRepositoryTag( IGSIO "${GIT_PROTOCOL}://github.com/IGSIO/IGSIO.git" - "master" + "93b197fd3f8fb5353ccfdc51c1bca1d6b919d7cb" ) SET(PLUS_IGSIO_SRC_DIR ${CMAKE_BINARY_DIR}/Deps/IGSIO CACHE INTERNAL "Path to store IGSIO contents.") diff --git a/SuperBuild/External_InfraredSeekCam.cmake b/SuperBuild/External_InfraredSeekCam.cmake index 6091a364e..1653cbdd5 100644 --- a/SuperBuild/External_InfraredSeekCam.cmake +++ b/SuperBuild/External_InfraredSeekCam.cmake @@ -12,7 +12,7 @@ ELSE() SetGitRepositoryTag( SeekCameraLib "${GIT_PROTOCOL}://github.com/medtec4susdev/libseek-thermal.git" - master + "c4fa40f200ef1277675e882358884049b8934d5e" ) SET (PLUS_SeekCameraLib_SRC_DIR "${CMAKE_BINARY_DIR}/Deps/SeekCameraLib") diff --git a/SuperBuild/External_OpenIGTLink.cmake b/SuperBuild/External_OpenIGTLink.cmake index 29e2b2e80..fdf0ed544 100644 --- a/SuperBuild/External_OpenIGTLink.cmake +++ b/SuperBuild/External_OpenIGTLink.cmake @@ -16,7 +16,7 @@ ELSE() SetGitRepositoryTag( OpenIGTLink "${GIT_PROTOCOL}://github.com/openigtlink/OpenIGTLink.git" - "master" + "2081e418c48c02e920487e2284996c1e577c1024" ) SET (PLUS_OpenIGTLink_SRC_DIR "${CMAKE_BINARY_DIR}/Deps/OpenIGTLink") diff --git a/SuperBuild/External_OpenIGTLinkIO.cmake b/SuperBuild/External_OpenIGTLinkIO.cmake index cad09b9e4..bdfa78a56 100644 --- a/SuperBuild/External_OpenIGTLinkIO.cmake +++ b/SuperBuild/External_OpenIGTLinkIO.cmake @@ -13,7 +13,7 @@ ELSE() SetGitRepositoryTag( OpenIGTLinkIO "${GIT_PROTOCOL}://github.com/IGSIO/OpenIGTLinkIO.git" - "master" + "1a2eda5ddb795df8bb5bfbba589c9650095ba4cd" ) SET (PLUS_OpenIGTLinkIO_SRC_DIR "${CMAKE_BINARY_DIR}/Deps/OpenIGTLinkIO") diff --git a/SuperBuild/External_OvrvisionPro.cmake b/SuperBuild/External_OvrvisionPro.cmake index 04a761f8a..4dfb9164f 100644 --- a/SuperBuild/External_OvrvisionPro.cmake +++ b/SuperBuild/External_OvrvisionPro.cmake @@ -36,7 +36,7 @@ ELSE() SetGitRepositoryTag( OvrvisionPro "${GIT_PROTOCOL}://github.com/PLUSToolkit/OvrvisionProCMake.git" - "master" + "761a54917e6070a8148dc373d640a2ffe191ac7d" ) ExternalProject_Add( OvrvisionPro diff --git a/SuperBuild/External_PlusModelCatalog.cmake b/SuperBuild/External_PlusModelCatalog.cmake index 7d3af03ec..4b3f2c2a2 100644 --- a/SuperBuild/External_PlusModelCatalog.cmake +++ b/SuperBuild/External_PlusModelCatalog.cmake @@ -4,7 +4,7 @@ SetGitRepositoryTag( PlusModelCatalog "${GIT_PROTOCOL}://github.com/PlusToolkit/PlusModelCatalog.git" - "master" + "651be1563b40a3552f18436f580d1c14d1b388f9" ) SET (PLUS_PLUSMODELCATALOG_DIR ${CMAKE_BINARY_DIR}/PlusModelCatalog CACHE INTERNAL "Path to store Plus Model Catalog.") diff --git a/SuperBuild/External_Tesseract.cmake b/SuperBuild/External_Tesseract.cmake index ac21699ef..92ed1b17b 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 d8ac9588f..36e1e9629 100644 --- a/SuperBuild/External_aruco.cmake +++ b/SuperBuild/External_aruco.cmake @@ -12,7 +12,7 @@ ELSE() SetGitRepositoryTag( aruco "${GIT_PROTOCOL}://github.com/PlusToolkit/aruco.git" - "master" + "cf93865edf157aa45c64c8f2084dcef59e58dda3" ) SET (PLUS_aruco_src_DIR ${CMAKE_BINARY_DIR}/Deps/aruco CACHE INTERNAL "Path to store aruco contents") diff --git a/SuperBuild/External_libwebm.cmake b/SuperBuild/External_libwebm.cmake index 8a3da08df..b6a4c9666 100644 --- a/SuperBuild/External_libwebm.cmake +++ b/SuperBuild/External_libwebm.cmake @@ -12,7 +12,7 @@ ELSE() SetGitRepositoryTag( libwebm "${GIT_PROTOCOL}://github.com/Sunderlandkyl/libwebm.git" - "master" + "e1d4caa3f52d9496a7910b5cbbf280056e994030" ) SET (PLUS_libwebm_SRC_DIR ${CMAKE_BINARY_DIR}/Deps/libwebm CACHE INTERNAL "Path to store libwebm contents.") diff --git a/SuperBuild/External_ndicapi.cmake b/SuperBuild/External_ndicapi.cmake index a048fc237..4bdca310c 100644 --- a/SuperBuild/External_ndicapi.cmake +++ b/SuperBuild/External_ndicapi.cmake @@ -11,7 +11,7 @@ ELSE() SetGitRepositoryTag( ndicapi "${GIT_PROTOCOL}://github.com/PlusToolkit/ndicapi.git" - "master" + "7af09f359cf713de095246bf0dae2763b1c7d135" ) # -------------------------------------------------------------------------- From 2835078c677eac0d493adf855c4bf4ba1fb8848e Mon Sep 17 00:00:00 2001 From: Kyle Sunderland Date: Thu, 28 Feb 2019 11:23:19 -0500 Subject: [PATCH 2/8] re PlusToolkit/PlusLib#501: Update Motive to 2.1.1 --- CMakeLists.txt | 13 +++++++++++++ Modules/FindMotiveAPI.cmake | 12 ++++++------ SuperBuild/External_PlusLib.cmake | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdb5ad6aa..c386f7eee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,6 +228,19 @@ ENDIF() # ---------- Tracking Hardware ------------ OPTION(PLUS_USE_OPTITRACK "Provide support for the OptiTrack tracking system" OFF) +IF (PLUS_USE_OPTITRACK) + IF(NOT ${CMAKE_GENERATOR} MATCHES "Win64") + SET(MOTIVE_VERSION_DEFAULT "1.10.3") + ELSE() + SET(MOTIVE_VERSION_DEFAULT "2.1.1") + ENDIF() + SET(MOTIVE_VERSION ${MOTIVE_VERSION_DEFAULT} CACHE STRING "Choose the motive API version.") + IF (TEMP_OS_ARCH MATCHES "x86" AND MOTIVE_VERSION VERSION_GREATER "2.1.0") + MESSAGE(FATAL_ERROR "MOTIVE_VERSION cannot be greater than 2.1.0 for 32-bit builds") + ENDIF() + set_property(CACHE MOTIVE_VERSION PROPERTY STRINGS "1.10.3" "2.1.1") +ENDIF() + OPTION(PLUS_USE_OPTIMET_CONOPROBE "Provide support for the Optimet ConoProbe" OFF) OPTION(PLUS_USE_NDI "Provide support for the NDI POLARIS and AURORA" OFF) diff --git a/Modules/FindMotiveAPI.cmake b/Modules/FindMotiveAPI.cmake index e59a40ef7..1b2ec2336 100644 --- a/Modules/FindMotiveAPI.cmake +++ b/Modules/FindMotiveAPI.cmake @@ -15,10 +15,10 @@ # MOTIVE_OPENMP_DIR Location of libiomp5md.dll needed to use Motive API SET(MOTIVEAPI_PATH_HINTS - "../PLTools/OptiTrack/MotiveAPI-2.0.2" - "../../PLTools/OptiTrack/MotiveAPI-2.0.2" - "../trunk/PLTools/OptiTrack/MotiveAPI-2.0.2" - "${CMAKE_CURRENT_BINARY_DIR}/PLTools/OptiTrack/MotiveAPI-2.0.2" + "../PLTools/OptiTrack/MotiveAPI-${MOTIVE_VERSION}" + "../../PLTools/OptiTrack/MotiveAPI-${MOTIVE_VERSION}" + "../trunk/PLTools/OptiTrack/MotiveAPI-${MOTIVE_VERSION}" + "${CMAKE_CURRENT_BINARY_DIR}/PLTools/OptiTrack/MotiveAPI-${MOTIVE_VERSION}" "$ENV{PROGRAMFILES}/OptiTrack/Motive" "$ENV{PROGRAMW6432}/OptiTrack/Motive" "C:/Program Files (x86)/OptiTrack/Motive" @@ -36,7 +36,7 @@ IF (MOTIVE_DIR) #Version #TODO: properly set SDK version using REGEX - set(MOTIVE_API_VERSION "2.0.2") + set(MOTIVE_API_VERSION ${MOTIVE_VERSION}) ENDIF () @@ -45,4 +45,4 @@ find_package_handle_standard_args(MOTIVE_API FOUND_VAR MOTIVE_API_FOUND REQUIRED_VARS MOTIVE_API_INCLUDE_DIR MOTIVE_DIR VERSION_VAR MOTIVE_API_VERSION -) \ No newline at end of file +) diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index 2e459915c..75f99074e 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -84,6 +84,7 @@ IF(PLUS_USE_OPTITRACK) LIST(APPEND PLUSBUILD_ADDITIONAL_SDK_ARGS -DOPTITRACK_MOTIVE_INCLUDE_DIR:PATH=${MOTIVE_API_INCLUDE_DIR} -DOPTITRACK_MOTIVE_DIR:PATH=${MOTIVE_DIR} + -DOPTITRACK_MOTIVE_VERSION:STRING=${MOTIVE_VERSION} -DOPTITRACK_NATNET_INCLUDE_DIR:PATH=${NATNET_SDK_INCLUDE_DIR} -DOPTITRACK_NATNET_LIBRARY_DIR:PATH=${NATNET_SDK_LIBRARY_DIR} From ff7790cd2d4b0183e828cb8cfbc4814844ba0ff7 Mon Sep 17 00:00:00 2001 From: Sunderlandkyl Date: Thu, 11 Apr 2019 17:58:54 -0400 Subject: [PATCH 3/8] Fix missing dll in 32-bit packages with OptiTrack Plus will not start in 32-bit when OptiTrack is enabled (Motive 1.10) Re-implementing missing fix from: cf626756a0a5e0614a643c22d50c205b26eef668 --- Modules/FindMotiveAPI.cmake | 12 ++++++++++++ SuperBuild/External_PlusLib.cmake | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Modules/FindMotiveAPI.cmake b/Modules/FindMotiveAPI.cmake index 1b2ec2336..564f1e921 100644 --- a/Modules/FindMotiveAPI.cmake +++ b/Modules/FindMotiveAPI.cmake @@ -25,10 +25,22 @@ 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") +find_path(MOTIVE_MSVC80_OpenMP_DIR + NAMES vcomp.dll + PATHS ${Microsoft_VC80_OpenMP_PATH_HINTS} + DOC "Microsoft VC80 OpenMP directory") + IF (MOTIVE_DIR) # Include directories set(MOTIVE_API_INCLUDE_DIR ${MOTIVE_DIR}/inc) diff --git a/SuperBuild/External_PlusLib.cmake b/SuperBuild/External_PlusLib.cmake index 75f99074e..eb9525bb9 100644 --- a/SuperBuild/External_PlusLib.cmake +++ b/SuperBuild/External_PlusLib.cmake @@ -91,7 +91,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} + -DOPTITRACK_MSVC80_OPENMP_DIR:PATH=${MOTIVE_MSVC80_OpenMP_DIR} ) ENDIF() From 4ffff5d619b41065e0beb4d9dd3c0749bb6971cd Mon Sep 17 00:00:00 2001 From: Kyle Sunderland Date: Mon, 17 Jun 2019 11:53:08 -0400 Subject: [PATCH 4/8] Fix CMake compatibility issues with Visual Studio 2019 --- CMakeLists.txt | 16 +++++++++------- Modules/FindQuadroSDI.cmake | 4 ++-- SuperBuild/External_OvrvisionPro.cmake | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c386f7eee..2fe93ee29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,13 +103,18 @@ ENDIF() # Options to control build process #----------------------------------------------------------------------------- +SET(BUILD_ARCHITECTURE "x64") +IF(CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(BUILD_ARCHITECTURE "x86") +ENDIF() + # Determine the operating system to set default values accordingly SET(ENABLED_BY_DEFAULT_ON_WINDOWS_ONLY OFF) SET(ENABLED_BY_DEFAULT_ON_WINDOWS32_ONLY OFF) SET(ENABLED_BY_DEFAULT_ON_WINDOWS64_ONLY OFF) IF(CMAKE_HOST_WIN32) SET(ENABLED_BY_DEFAULT_ON_WINDOWS_ONLY ON) - IF(NOT CMAKE_CL_64) + IF(BUILD_ARCHITECTURE MATCHES "x86") SET(ENABLED_BY_DEFAULT_ON_WINDOWS32_ONLY ON) ELSE() SET(ENABLED_BY_DEFAULT_ON_WINDOWS64_ONLY ON) @@ -190,7 +195,7 @@ IF(PLUS_USE_BKPROFOCUS_VIDEO) OPTION(PLUS_USE_BKPROFOCUS_CAMERALINK "Enable acquisition from BK ProFocus ultrasound systems through CameraLink interface" OFF) OPTION(PLUS_TEST_BKPROFOCUS "Enable testing of acquisition from BK ProFocus ultrasound systems. Enable this only if a BK ProFocus device is connected to this computer. " OFF) ENDIF() -IF((NOT ${CMAKE_GENERATOR} MATCHES "Win64") AND TEMP_OS_ARCH MATCHES "x64" AND PLUS_USE_BKPROFOCUS_CAMERALINK) +IF((NOT BUILD_ARCHITECTURE MATCHES "x64") AND TEMP_OS_ARCH MATCHES "x64" AND PLUS_USE_BKPROFOCUS_CAMERALINK) # warning regarding cross compilation of bkprofocus MESSAGE("BK ProFocus support on a 64-bit OS requires 64-bit Plus build. A 64-bit OS and a 32-bit Plus build configuration is detected. Compilation will be successful, but the resulting executables will fail to start.") ENDIF() @@ -226,10 +231,11 @@ IF(PLUS_USE_PHILIPS_3D_ULTRASOUND) ENDIF() ENDIF() +message(${BUILD_ARCHITECTURE}) # ---------- Tracking Hardware ------------ OPTION(PLUS_USE_OPTITRACK "Provide support for the OptiTrack tracking system" OFF) IF (PLUS_USE_OPTITRACK) - IF(NOT ${CMAKE_GENERATOR} MATCHES "Win64") + IF(NOT BUILD_ARCHITECTURE MATCHES "x64") SET(MOTIVE_VERSION_DEFAULT "1.10.3") ELSE() SET(MOTIVE_VERSION_DEFAULT "2.1.1") @@ -774,7 +780,6 @@ SET(PlusModelCatalog_DEPENDENCIES PlusLib) #------------------------------------------------------------------------------ # Construct a descriptive build name #------------------------------------------------------------------------------ -SET(BUILD_ARCHITECTURE "x64") IF(UNIX AND NOT APPLE) SET(LINUX TRUE) @@ -836,9 +841,6 @@ ENDIF() IF(WIN32) SET(SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_VERSION}") - IF(NOT ${CMAKE_GENERATOR} MATCHES "Win64") - SET(BUILD_ARCHITECTURE "x86") - ENDIF() ENDIF() SET(PLUSBUILD_BUILDNAME_POSTFIX "" CACHE STRING "Postfix that will be appended to the build name on the dashboard. If defined then BUILDNAME variable is always overwritten.") diff --git a/Modules/FindQuadroSDI.cmake b/Modules/FindQuadroSDI.cmake index 5c41a78ff..94d6ec7e1 100644 --- a/Modules/FindQuadroSDI.cmake +++ b/Modules/FindQuadroSDI.cmake @@ -25,7 +25,7 @@ IF(QuadroSDI_INCLUDE_DIR) # Prioritize finding the lib near the header to hopefully ensure they match. GET_FILENAME_COMPONENT(_ROOT_DIR ${QuadroSDI_INCLUDE_DIR} DIRECTORY) - IF( (MSVC AND ${CMAKE_GENERATOR} MATCHES "Win64") OR NOT MSVC) + IF( (MSVC AND ${BUILD_ARCHITECTURE} MATCHES "x64") OR NOT MSVC) FIND_PATH(nvapi_LIBRARY NAMES nvapi64.lib PATH_SUFFIXES lib64 PATHS "${_ROOT_DIR}") ELSE() FIND_PATH(nvapi_LIBRARY NAMES nvapi.lib PATH_SUFFIXES lib32 PATHS "${_ROOT_DIR}") @@ -58,7 +58,7 @@ IF(QuadroSDI_FOUND) SET_PROPERTY(TARGET QuadroSDI PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${QuadroSDI_INCLUDE_DIRS} ) - IF( (MSVC AND ${CMAKE_GENERATOR} MATCHES "Win64") OR NOT MSVC) + IF( (MSVC AND ${BUILD_ARCHITECTURE} MATCHES "x64") OR NOT MSVC) SET_PROPERTY(TARGET QuadroSDI PROPERTY INTERFACE_LINK_LIBRARIES ${QuadroSDI_LIBRARY_DIR}/nvapi64${CMAKE_STATIC_LIBRARY_SUFFIX} ${QuadroSDI_LIBRARY_DIR}/ANCapi${CMAKE_STATIC_LIBRARY_SUFFIX} diff --git a/SuperBuild/External_OvrvisionPro.cmake b/SuperBuild/External_OvrvisionPro.cmake index 4dfb9164f..70a4ab940 100644 --- a/SuperBuild/External_OvrvisionPro.cmake +++ b/SuperBuild/External_OvrvisionPro.cmake @@ -23,7 +23,7 @@ ELSE() # Since OvrvisionPro SDK uses #pragma comment(lib...) commands, we need to pass in the directories containing the requested libraries directly... # ippicvmt.lib - IF( MSVC AND ${CMAKE_GENERATOR} MATCHES "Win64" ) + IF( MSVC AND ${BUILD_ARCHITECTURE} MATCHES "x64" ) SET(OvrvisionPro_PRAGMA_HACK -DPragmaHack_DIR:PATH=${PLUS_OpenCV_src_DIR}/3rdparty/ippicv/unpack/ippicv_win/lib/intel64) ELSEIF(MSVC) SET(OvrvisionPro_PRAGMA_HACK -DPragmaHack_DIR:PATH=${PLUS_OpenCV_src_DIR}/3rdparty/ippicv/unpack/ippicv_win/lib/ia32) From e841082e043c561d8e1a56de237f5543f1589593 Mon Sep 17 00:00:00 2001 From: Daniele Piccolo Date: Sun, 29 Nov 2020 00:58:27 +0100 Subject: [PATCH 5/8] Update External_ITK.cmake (#70) update external git reference to ITK --- SuperBuild/External_ITK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SuperBuild/External_ITK.cmake b/SuperBuild/External_ITK.cmake index eff49d7ee..85c0b690c 100644 --- a/SuperBuild/External_ITK.cmake +++ b/SuperBuild/External_ITK.cmake @@ -12,7 +12,7 @@ ELSE() # ITK has not been built yet, so download and build it as an external project SetGitRepositoryTag( itk - "${GIT_PROTOCOL}://itk.org/ITK.git" + "${GIT_PROTOCOL}://github.com/InsightSoftwareConsortium/ITK.git" "v4.12.0" ) @@ -52,4 +52,4 @@ ELSE() INSTALL_COMMAND "" DEPENDS ${ITK_DEPENDENCIES} ) -ENDIF() \ No newline at end of file +ENDIF() From 3fe588653a41499f66e490b5007acf62859dd333 Mon Sep 17 00:00:00 2001 From: Sunderlandkyl Date: Mon, 5 Jun 2023 11:32:11 -0400 Subject: [PATCH 6/8] COMP: Allow building Stealthlink using Visual Studio 2010 toolset --- Modules/FindSTEALTHLINK.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindSTEALTHLINK.cmake b/Modules/FindSTEALTHLINK.cmake index 7eb59e24e..00588baa3 100644 --- a/Modules/FindSTEALTHLINK.cmake +++ b/Modules/FindSTEALTHLINK.cmake @@ -16,9 +16,9 @@ SET( STEALTHLINK_PATH_HINTS ) IF (WIN32) - IF(NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio 10" ) + IF(NOT ${MSVC10}) MESSAGE(FATAL_ERROR "error: StealthLink can only be built using Visual Studio 2010") - ENDIF(NOT ${CMAKE_GENERATOR} MATCHES "Visual Studio 10" ) + ENDIF(NOT ${MSVC10}) IF (CMAKE_CL_64) SET( PLATFORM_SUFFIX "/windows/x64/Release") SET( PLATFORM_SUFFIXD "/windows/x64/Debug") From 6cbd3c6cdbf6e9eced7ee3a4626e221fb9f21dd8 Mon Sep 17 00:00:00 2001 From: Sunderlandkyl Date: Mon, 5 Jun 2023 11:33:49 -0400 Subject: [PATCH 7/8] ENH: Remove unnecessary message --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fe93ee29..5a2255f60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,7 +231,6 @@ IF(PLUS_USE_PHILIPS_3D_ULTRASOUND) ENDIF() ENDIF() -message(${BUILD_ARCHITECTURE}) # ---------- Tracking Hardware ------------ OPTION(PLUS_USE_OPTITRACK "Provide support for the OptiTrack tracking system" OFF) IF (PLUS_USE_OPTITRACK) From b6eaa5f972a9b8ce90d6e46a6ac0277295a33d91 Mon Sep 17 00:00:00 2001 From: Kyle Sunderland Date: Fri, 21 Feb 2025 14:02:55 -0500 Subject: [PATCH 8/8] DOC: Update dashboard URL to open.cdash.org --- CTestConfig.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 88869c0ac..5893140c2 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -2,13 +2,13 @@ ## Then modify the CMakeLists.txt file in the root directory of your ## project to incorporate the testing dashboard. ## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) +## enable_testing() +## include(CTest) set(CTEST_PROJECT_NAME "PlusBuild") set(CTEST_BUILD_NAME "PlusBuild") set(CTEST_NIGHTLY_START_TIME "00:00:00 EST") -set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "perkdata.cs.queensu.ca") -set(CTEST_DROP_LOCATION "/CDash/submit.php?project=PlusBuild") +set(CTEST_DROP_METHOD "https") +set(CTEST_DROP_SITE "open.cdash.org") +set(CTEST_DROP_LOCATION "/submit.php?project=PlusBuild") set(CTEST_DROP_SITE_CDASH TRUE)