From 3307204f9b6883659ca64ced38245f755a17a574 Mon Sep 17 00:00:00 2001 From: Andras Lasso Date: Tue, 16 Aug 2016 14:53:53 +0000 Subject: [PATCH 1/6] 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. --- PlusBuild/CMakeLists.txt | 21 +----- PlusBuild/External_PlusApp.cmake | 2 +- PlusBuild/External_PlusLib.cmake | 71 +++++-------------- PlusBuild/External_PlusLibData.cmake | 2 +- PlusBuild/Modules/FindWindowsSDK.cmake | 12 +--- .../Modules/PlusTestWindowsSdkCompatible.cxx | 12 +--- PlusBuild/Modules/TestWindowsSDK.cmake | 8 +-- 7 files changed, 28 insertions(+), 100 deletions(-) diff --git a/PlusBuild/CMakeLists.txt b/PlusBuild/CMakeLists.txt index 7ec81ab3a..2e0788488 100644 --- a/PlusBuild/CMakeLists.txt +++ b/PlusBuild/CMakeLists.txt @@ -201,6 +201,7 @@ OPTION(PLUS_USE_POLARIS "Provide support for the NDI POLARIS and AURORA" OFF) MARK_AS_ADVANCED(PLUS_USE_POLARIS) OPTION(PLUS_USE_CERTUS "Provide support for the NDI Certus" OFF) MARK_AS_ADVANCED(PLUS_USE_CERTUS) + IF(PLUS_USE_POLARIS) MESSAGE("PLUS_USE_POLARIS has been deprecated. Changing to PLUS_USE_NDI instead.") SET(PLUS_USE_POLARIS OFF CACHE BOOL "Provide support for the NDI POLARIS and AURORA" FORCE) @@ -222,7 +223,6 @@ OPTION(PLUS_USE_PHIDGET_SPATIAL_TRACKER "Provide support for the Phidget Spatial OPTION(PLUS_USE_3dConnexion_TRACKER "Provide support for the 3dConnexion 3d mouse" OFF) OPTION(PLUS_USE_STEALTHLINK "Provide support for the Medtronick StealthLink Server" OFF) OPTION(PLUS_USE_IntuitiveDaVinci "Provide support for the da Vinci Surgical System" OFF) - OPTION(PLUS_USE_PHILIPS_3D_ULTRASOUND "Provide support for the Philips ie33 3D ultrasound probe" OFF) IF(PLUS_USE_PHILIPS_3D_ULTRASOUND) OPTION(PLUS_TEST_PHILIPS_3D_ULTRASOUND "Enable testing of acquisition from Philips 3D ultrasound systems. Enable this only if a Philips device is accessible from this computer. " OFF) @@ -231,25 +231,8 @@ IF (PLUS_TEST_PHILIPS_3D_ULTRASOUND) SET (PLUS_TEST_PHILIPS_3D_ULTRASOUND_IP_ADDRESS "129.100.44.8" CACHE STRING "IP address of the Philips scanner that is used during testing") ENDIF(PLUS_TEST_PHILIPS_3D_ULTRASOUND) -OPTION(PLUS_USE_NVIDIA_DVP "Provide support for the NVidia Digital Video Pipeline" OFF) -IF (PLUS_USE_NVIDIA_DVP) - SET(PLUS_USE_NVIDIA_DVP_MODE "GL" CACHE STRING "Choose the graphics backend to use for the DVP.") - set_property(CACHE PLUS_USE_NVIDIA_DVP_MODE PROPERTY STRINGS "GL" "CUDA" "D3D9" "D3D10" "D3D11") - - IF( "${PLUS_USE_NVIDIA_DVP_MODE}" STREQUAL "GL" ) - FIND_PACKAGE(OpenGL REQUIRED) - IF( "${OPENGL_INCLUDE_DIR}" STREQUAL "" ) - MESSAGE(FATAL_ERROR "OPENGL_INCLUDE_DIR could not be populated. Please specify manually. Aborting.") - ELSE() - IF(NOT EXISTS ${OPENGL_INCLUDE_DIR}/GL/gl.h) - MESSAGE(FATAL_ERROR "OPENGL_INCLUDE_DIR: ${OPENGL_INCLUDE_DIR} does not contain GL/gl.h. Aborting.") - ENDIF() - ENDIF() - ENDIF() -ENDIF() - -#----------------------------------------------------------------------------- # Other + OPTION (PLUSAPP_TEST_GUI "Enable Sikuli GUI tests" ON) OPTION (PLUS_TEST_HIGH_ACCURACY_TIMING "Enable testing of high-accuracy timing. High-accuracy timing may not be available on virtual machines and so testing may be turned off to avoid false alarams." ON) diff --git a/PlusBuild/External_PlusApp.cmake b/PlusBuild/External_PlusApp.cmake index e51705bdd..5bae58425 100644 --- a/PlusBuild/External_PlusApp.cmake +++ b/PlusBuild/External_PlusApp.cmake @@ -32,7 +32,7 @@ ExternalProject_Add(PlusApp #--Download step-------------- SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME} SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD} - SVN_REPOSITORY https://subversion.assembla.com/svn/plus/trunk/PlusApp + SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4.0/PlusApp ${PLUSBUILD_SVN_REVISION_ARGS} #--Configure step------------- CMAKE_ARGS diff --git a/PlusBuild/External_PlusLib.cmake b/PlusBuild/External_PlusLib.cmake index a62b1c4bb..fceb97ab8 100644 --- a/PlusBuild/External_PlusLib.cmake +++ b/PlusBuild/External_PlusLib.cmake @@ -133,24 +133,11 @@ IF ( PLUS_USE_INTELREALSENSE ) SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS} -DINTELREALSENSE_INCLUDE_DIR:PATH=${RSSDK_INCLUDE_DIRS} -DINTELREALSENSE_RELEASE_LIB:PATH=${RSSDK_LIBRARY} - -DINTELREALSENSE_DEBUG_LIB:PATH=${RSSDK_LIBRARY_DEBUG} + -DINTELREALSENSE_DEBUG_LIB:PATH=${RSSDK_LIBRARY_DEBUG} #-DINTELREALSENSE_BINARY_DIR:PATH=${INTELREALSENSE_BINARY_DIR} ) ENDIF() -IF( PLUS_USE_NVIDIA_DVP ) - SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS} - -DNVIDIA_DVP_INCLUDE_DIR:PATH=${NVIDIA_DVP_INCLUDE_DIR} - -DNVIDIA_DVP_BINARY_DIR:PATH=${NVIDIA_DVP_BINARY_DIR} - -DNVIDIA_DVP_LIB_DIR:PATH=${NVIDIA_DVP_LIB_DIR} - -DPLUS_USE_NVIDIA_DVP_MODE:STRING=${PLUS_USE_NVIDIA_DVP_MODE} - ) - IF( "${PLUS_USE_NVIDIA_DVP_MODE}" STREQUAL "GL" ) - SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS} - -DOPENGL_INCLUDE_DIR:PATH=${OPENGL_INCLUDE_DIR} - ) - ENDIF() -ENDIF() IF ( PLUS_USE_IntuitiveDaVinci ) SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS} @@ -159,7 +146,7 @@ IF ( PLUS_USE_IntuitiveDaVinci ) ) ENDIF() -IF ( PLUS_USE_MMF_VIDEO OR PLUS_USE_TELEMED_VIDEO ) +IF ( PLUS_USE_MMF_VIDEO OR PLUS_USE_TELEMED_VIDEO) # Get latest full Windows SDK (that contains actual header and lib files) FIND_PACKAGE(WindowsSDK REQUIRED) SET(WINDOWS_SDK_ROOT_DIRS ${WINDOWSSDK_PREFERRED_FIRST_DIRS}) @@ -172,47 +159,22 @@ IF ( PLUS_USE_MMF_VIDEO OR PLUS_USE_TELEMED_VIDEO ) SET(WINDOWS_SDK_LIBRARY_DIRS "NOTFOUND") get_windowssdk_include_dirs("${_dir}" WINDOWS_SDK_INCLUDE_DIRS) get_windowssdk_library_dirs("${_dir}" WINDOWS_SDK_LIBRARY_DIRS) - - # Now check each version to see if it is compatible - IF(NOT "${WINDOWS_SDK_INCLUDE_DIRS}" STREQUAL "NOTFOUND" AND NOT "${WINDOWS_SDK_LIBRARY_DIRS}" STREQUAL "NOTFOUND") - # Reverse list to put latest version first - LIST(REVERSE WINDOWS_SDK_INCLUDE_DIRS) - LIST(REVERSE WINDOWS_SDK_LIBRARY_DIRS) - LIST(LENGTH WINDOWS_SDK_INCLUDE_DIRS _dir_list_size) - - foreach(_dir_index RANGE ${_dir_list_size}) - LIST(GET WINDOWS_SDK_INCLUDE_DIRS ${_dir_index} _WINDOWS_SDK_INCLUDE_DIR) - LIST(GET WINDOWS_SDK_LIBRARY_DIRS ${_dir_index} _WINDOWS_SDK_LIBARY_DIR) - - # Do not allow ucrt version to be used - STRING(FIND ${_WINDOWS_SDK_LIBARY_DIR} "ucrt" _ucrt_found) - IF( NOT ${_ucrt_found} EQUAL -1 ) - continue() - ENDIF() - - INCLUDE(TestWindowsSDK) - IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE) - # Found a compatible Windows SDK - break() - ENDIF() - endforeach() - ENDIF() - - IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE) - # Found a compatible Windows SDK - break() - ENDIF() + if(NOT "${WINDOWS_SDK_INCLUDE_DIRS}" STREQUAL "NOTFOUND" AND NOT "${WINDOWS_SDK_LIBRARY_DIRS}" STREQUAL "NOTFOUND") + INCLUDE(TestWindowsSDK) + IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE) + # Found a compatible Windows SDK + break() + ENDIF() + endif() endforeach() - - IF (PLUS_WINDOWS_SDK_IS_COMPATIBLE) + if (PLUS_WINDOWS_SDK_IS_COMPATIBLE) SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS} - -DWINDOWS_SDK_INCLUDE_DIRS:PATH=${_WINDOWS_SDK_INCLUDE_DIR} - -DWINDOWS_SDK_LIBRARY_DIRS:PATH=${_WINDOWS_SDK_LIBARY_DIR} + -DWINDOWS_SDK_INCLUDE_DIRS:PATH=${WINDOWS_SDK_INCLUDE_DIRS} + -DWINDOWS_SDK_LIBRARY_DIRS:PATH=${WINDOWS_SDK_LIBRARY_DIRS} ) - MESSAGE(STATUS "Sending Windows SDK: ${_WINDOWS_SDK_LIBARY_DIR} to PlusLib.") - ELSE() - MESSAGE(FATAL_ERROR "Windows SDKs found at ${WINDOWS_SDK_ROOT_DIRS} are not compatible with Plus") - ENDIF() + else() + MESSAGE(WARNING "Windows SDKs found at ${WINDOWS_SDK_ROOT_DIRS} are not compatible with Plus") + endif() ENDIF() IF ( PLUS_USE_MMF_VIDEO ) @@ -291,7 +253,7 @@ ExternalProject_Add(PlusLib #--Download step-------------- SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME} SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD} - SVN_REPOSITORY https://subversion.assembla.com/svn/plus/trunk/PlusLib + SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4.0/PlusLib ${PLUSBUILD_SVN_REVISION_ARGS} #--Configure step------------- CMAKE_ARGS @@ -336,7 +298,6 @@ ExternalProject_Add(PlusLib -DPLUS_USE_MMF_VIDEO:BOOL=${PLUS_USE_MMF_VIDEO} -DPLUS_USE_STEALTHLINK:BOOL=${PLUS_USE_STEALTHLINK} -DPLUS_USE_PHILIPS_3D_ULTRASOUND:BOOL=${PLUS_USE_PHILIPS_3D_ULTRASOUND} - -DPLUS_USE_NVIDIA_DVP:BOOL=${PLUS_USE_NVIDIA_DVP} -DBUILD_DOCUMENTATION:BOOL=${PLUSBUILD_DOCUMENTATION} -DPLUS_TEST_HIGH_ACCURACY_TIMING:BOOL=${PLUS_TEST_HIGH_ACCURACY_TIMING} ${PLUSBUILD_ADDITIONAL_SDK_ARGS} diff --git a/PlusBuild/External_PlusLibData.cmake b/PlusBuild/External_PlusLibData.cmake index 00a147cc9..552803377 100644 --- a/PlusBuild/External_PlusLibData.cmake +++ b/PlusBuild/External_PlusLibData.cmake @@ -14,7 +14,7 @@ ExternalProject_Add(PlusLibData #--Download step-------------- SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME} SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD} - SVN_REPOSITORY https://subversion.assembla.com/svn/plus/trunk/PlusLibData + SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4.0/PlusLibData ${PLUSLIBDATA_SVN_REV} #--Configure step------------- CONFIGURE_COMMAND "" diff --git a/PlusBuild/Modules/FindWindowsSDK.cmake b/PlusBuild/Modules/FindWindowsSDK.cmake index 537b7a873..5497252f6 100644 --- a/PlusBuild/Modules/FindWindowsSDK.cmake +++ b/PlusBuild/Modules/FindWindowsSDK.cmake @@ -64,7 +64,7 @@ macro(_winsdk_announce) endif() endmacro() -set(_winsdk_win10vers 10.0.10056.0 10.0.10240.0 10.0.10586.0 10.0.14393.0) +set(_winsdk_win10vers 10.0.10056.0 10.0.10240.0) if(WindowsSDK_FIND_COMPONENTS MATCHES "tools") set(_WINDOWSSDK_IGNOREMSVC ON) @@ -284,11 +284,9 @@ if(_winsdk_msvc_greater_1310) # Newer than VS .NET/VS Toolkit 2003 _winsdk_check_microsoft_sdks_registry(v10.0A) - #10.0.10056.0 10.0.10240.0 10.0.10586.0 10.0.14393.0 - # Windows Software Development Kit (SDK) for Windows 10 - _winsdk_check_microsoft_sdks_registry(v10.0 10.0.14393.0) - _winsdk_check_windows_kits_registry("Windows Kits 10" 10.0.14393.0 KitsRoot10) + _winsdk_check_microsoft_sdks_registry(v10.0 10.0.10240.0) + _winsdk_check_windows_kits_registry("Windows Kits 10" 10.0.10240.0 KitsRoot10) endif() # vista-only and 2013+ # Included in Visual Studio 2013 @@ -409,10 +407,6 @@ if(_win_sdk_dirs) windowssdk_name_lookup("${WINDOWSSDK_LATEST_DIR}" WINDOWSSDK_LATEST_NAME) set(WINDOWSSDK_DIRS ${_win_sdk_dirs}) - - if(_WINDOWSSDK_ANNOUNCE) - message(STATUS "FindWindowsSDK: Using ${WINDOWSSDK_LATEST_NAME}.") - endif() # Fallback, in case no preference found. set(WINDOWSSDK_PREFERRED_DIR "${WINDOWSSDK_LATEST_DIR}") diff --git a/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx b/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx index 424b07472..fe9060772 100644 --- a/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx +++ b/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx @@ -1,15 +1,5 @@ // Minimal test for Windows SDK compatibility -// Ensure library files are available at the given link directories -#pragma comment(lib, "Evr.lib") -#pragma comment(lib, "Mf.lib") -#pragma comment(lib, "Mfplat.lib") -#pragma comment(lib, "Shlwapi.lib") -#pragma comment(lib, "Mfreadwrite.lib") -#pragma comment(lib, "mfuuid.lib") -#pragma comment(lib, "Strmiids.lib") - -// Ensure include files are available at the given link directories #include int main() @@ -20,4 +10,4 @@ int main() GUID guid2=MF_MT_FRAME_RATE_RANGE_MAX; return 0; -} \ No newline at end of file +} diff --git a/PlusBuild/Modules/TestWindowsSDK.cmake b/PlusBuild/Modules/TestWindowsSDK.cmake index b86919406..8259eceb8 100644 --- a/PlusBuild/Modules/TestWindowsSDK.cmake +++ b/PlusBuild/Modules/TestWindowsSDK.cmake @@ -4,16 +4,16 @@ TRY_COMPILE(PLUS_WINDOWS_SDK_IS_COMPATIBLE "${CMAKE_BINARY_DIR}/CMakeTmp/WindowsSdkCompatibility" "${CMAKE_CURRENT_SOURCE_DIR}/Modules/PlusTestWindowsSdkCompatible.cxx" CMAKE_FLAGS - "-DINCLUDE_DIRECTORIES:STRING=${_WINDOWS_SDK_INCLUDE_DIR}" - "-DLINK_DIRECTORIES:STRING=${_WINDOWS_SDK_LIBRARY_DIR}" - "-DLINK_LIBRARIES:STRING=mfuuid.lib;Evr.lib;Mf.lib;Mfplat.lib;Shlwapi.lib;Mfreadwrite.lib;Strmiids.lib" + "-DINCLUDE_DIRECTORIES:STRING=${WINDOWS_SDK_INCLUDE_DIRS}" + "-DLINK_DIRECTORIES:STRING=${WINDOWS_SDK_LIBRARY_DIRS}" + "-DLINK_LIBRARIES:STRING=mfuuid.lib" OUTPUT_VARIABLE OUTPUT) IF(PLUS_WINDOWS_SDK_IS_COMPATIBLE) MESSAGE(STATUS "Checking if the latest Windows SDK is compatible -- yes") SET(PLUS_WINDOWS_SDK_IS_COMPATIBLE 1 CACHE INTERNAL "Windows SDK is compatible with Plus") WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeFiles/CMakeOutput.log - "Determining if the C++ compiler supports type GUID " + "Determining if the C++ compiler supports type bool " "passed with the following output:\n" "${OUTPUT}\n" APPEND) ELSE(PLUS_WINDOWS_SDK_IS_COMPATIBLE) From a8b08364a466443993834c185f9db7897aa5353a Mon Sep 17 00:00:00 2001 From: Adam Rankin Date: Tue, 16 Aug 2016 15:01:06 +0000 Subject: [PATCH 2/6] re #842: Renamed stable branch to Plus-2.4 --- PlusBuild/External_PlusApp.cmake | 2 +- PlusBuild/External_PlusLib.cmake | 2 +- PlusBuild/External_PlusLibData.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PlusBuild/External_PlusApp.cmake b/PlusBuild/External_PlusApp.cmake index 5bae58425..5f0d9b0ee 100644 --- a/PlusBuild/External_PlusApp.cmake +++ b/PlusBuild/External_PlusApp.cmake @@ -32,7 +32,7 @@ ExternalProject_Add(PlusApp #--Download step-------------- SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME} SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD} - SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4.0/PlusApp + SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4/PlusApp ${PLUSBUILD_SVN_REVISION_ARGS} #--Configure step------------- CMAKE_ARGS diff --git a/PlusBuild/External_PlusLib.cmake b/PlusBuild/External_PlusLib.cmake index fceb97ab8..93c5e3fb5 100644 --- a/PlusBuild/External_PlusLib.cmake +++ b/PlusBuild/External_PlusLib.cmake @@ -253,7 +253,7 @@ ExternalProject_Add(PlusLib #--Download step-------------- SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME} SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD} - SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4.0/PlusLib + SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4/PlusLib ${PLUSBUILD_SVN_REVISION_ARGS} #--Configure step------------- CMAKE_ARGS diff --git a/PlusBuild/External_PlusLibData.cmake b/PlusBuild/External_PlusLibData.cmake index 552803377..ea6163bde 100644 --- a/PlusBuild/External_PlusLibData.cmake +++ b/PlusBuild/External_PlusLibData.cmake @@ -14,7 +14,7 @@ ExternalProject_Add(PlusLibData #--Download step-------------- SVN_USERNAME ${PLUSBUILD_ASSEMBLA_USERNAME} SVN_PASSWORD ${PLUSBUILD_ASSEMBLA_PASSWORD} - SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4.0/PlusLibData + SVN_REPOSITORY https://subversion.assembla.com/svn/plus/branches/Plus-2.4/PlusLibData ${PLUSLIBDATA_SVN_REV} #--Configure step------------- CONFIGURE_COMMAND "" From 2776b5c74962062390dbfbc47ce2e2378ac50502 Mon Sep 17 00:00:00 2001 From: Adam Rankin Date: Sat, 27 Aug 2016 16:45:23 +0000 Subject: [PATCH 3/6] re #882 enabling build of stable branch with VS2015 --- PlusBuild/External_PlusLib.cmake | 8 +++++--- PlusBuild/Modules/FindWindowsSDK.cmake | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/PlusBuild/External_PlusLib.cmake b/PlusBuild/External_PlusLib.cmake index 93c5e3fb5..59764f70b 100644 --- a/PlusBuild/External_PlusLib.cmake +++ b/PlusBuild/External_PlusLib.cmake @@ -146,7 +146,7 @@ IF ( PLUS_USE_IntuitiveDaVinci ) ) ENDIF() -IF ( PLUS_USE_MMF_VIDEO OR PLUS_USE_TELEMED_VIDEO) +IF ( PLUS_USE_MMF_VIDEO OR PLUS_USE_TELEMED_VIDEO ) # Get latest full Windows SDK (that contains actual header and lib files) FIND_PACKAGE(WindowsSDK REQUIRED) SET(WINDOWS_SDK_ROOT_DIRS ${WINDOWSSDK_PREFERRED_FIRST_DIRS}) @@ -168,9 +168,11 @@ IF ( PLUS_USE_MMF_VIDEO OR PLUS_USE_TELEMED_VIDEO) endif() endforeach() if (PLUS_WINDOWS_SDK_IS_COMPATIBLE) + STRING(REPLACE ";" "#" _TMP_INCLUDE_STR "${WINDOWS_SDK_INCLUDE_DIRS}") + STRING(REPLACE ";" "#" _TMP_LIB_STR "${WINDOWS_SDK_LIBRARY_DIRS}") SET(PLUSBUILD_ADDITIONAL_SDK_ARGS ${PLUSBUILD_ADDITIONAL_SDK_ARGS} - -DWINDOWS_SDK_INCLUDE_DIRS:PATH=${WINDOWS_SDK_INCLUDE_DIRS} - -DWINDOWS_SDK_LIBRARY_DIRS:PATH=${WINDOWS_SDK_LIBRARY_DIRS} + -DWINDOWS_SDK_INCLUDE_DIRS:STRING=${_TMP_INCLUDE_STR} + -DWINDOWS_SDK_LIBRARY_DIRS:STRING=${_TMP_LIB_STR} ) else() MESSAGE(WARNING "Windows SDKs found at ${WINDOWS_SDK_ROOT_DIRS} are not compatible with Plus") diff --git a/PlusBuild/Modules/FindWindowsSDK.cmake b/PlusBuild/Modules/FindWindowsSDK.cmake index 5497252f6..399063904 100644 --- a/PlusBuild/Modules/FindWindowsSDK.cmake +++ b/PlusBuild/Modules/FindWindowsSDK.cmake @@ -64,7 +64,7 @@ macro(_winsdk_announce) endif() endmacro() -set(_winsdk_win10vers 10.0.10056.0 10.0.10240.0) +set(_winsdk_win10vers 10.0.10056.0 10.0.10240.0 10.0.10586.0 10.0.14393.0) if(WindowsSDK_FIND_COMPONENTS MATCHES "tools") set(_WINDOWSSDK_IGNOREMSVC ON) @@ -285,8 +285,8 @@ if(_winsdk_msvc_greater_1310) # Newer than VS .NET/VS Toolkit 2003 _winsdk_check_microsoft_sdks_registry(v10.0A) # Windows Software Development Kit (SDK) for Windows 10 - _winsdk_check_microsoft_sdks_registry(v10.0 10.0.10240.0) - _winsdk_check_windows_kits_registry("Windows Kits 10" 10.0.10240.0 KitsRoot10) + _winsdk_check_microsoft_sdks_registry(v10.0 10.0.14393.0) + _winsdk_check_windows_kits_registry("Windows Kits 10" 10.0.14393.0 KitsRoot10) endif() # vista-only and 2013+ # Included in Visual Studio 2013 From 3488a2997717f9cd836908e14df783ed71f3310c Mon Sep 17 00:00:00 2001 From: Andras Lasso Date: Tue, 13 Sep 2016 19:53:54 +0000 Subject: [PATCH 4/6] re #1112: Change default VTK randering backend to OpenGL OpenGL2 rendering backend has compatibility issues (does not work on Ultrasonix systems, does not work through Windows Remote Desktop, etc) and we don't need any features of the OpenGL2 VTK rendering backend. OpenGL2 can be optionally enabled by setting PLUSBUILD_VTK_RENDERING_BACKEND variable to OpenGL2. --- PlusBuild/CMakeLists.txt | 3 +++ PlusBuild/External_VTK.cmake | 1 + 2 files changed, 4 insertions(+) diff --git a/PlusBuild/CMakeLists.txt b/PlusBuild/CMakeLists.txt index 2e0788488..bfac4b210 100644 --- a/PlusBuild/CMakeLists.txt +++ b/PlusBuild/CMakeLists.txt @@ -233,6 +233,9 @@ ENDIF(PLUS_TEST_PHILIPS_3D_ULTRASOUND) # Other +set(PLUSBUILD_VTK_RENDERING_BACKEND "OpenGL" CACHE STRING "Choose the rendering backend. OpenGL2 is only compatible with more recent graphics cards and does not work on embedded systems like Ultrasonix Windows XPe based systems.") +set_property(CACHE PLUSBUILD_VTK_RENDERING_BACKEND PROPERTY STRINGS "OpenGL" "OpenGL2") + OPTION (PLUSAPP_TEST_GUI "Enable Sikuli GUI tests" ON) OPTION (PLUS_TEST_HIGH_ACCURACY_TIMING "Enable testing of high-accuracy timing. High-accuracy timing may not be available on virtual machines and so testing may be turned off to avoid false alarams." ON) diff --git a/PlusBuild/External_VTK.cmake b/PlusBuild/External_VTK.cmake index 9691cbe5f..4d1ab7a9f 100644 --- a/PlusBuild/External_VTK.cmake +++ b/PlusBuild/External_VTK.cmake @@ -198,6 +198,7 @@ ELSE(VTK_DIR) -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP" -DVTK_QT_VERSION:STRING=${QT_VERSION_MAJOR} -DVTK_WRAP_PYTHON:BOOL=OFF + -DVTK_RENDERING_BACKEND=${PLUSBUILD_VTK_RENDERING_BACKEND} #--Build step----------------- BUILD_ALWAYS 1 #--Install step----------------- From 115039c9703a019d7211bb0e34e0ab8a04b32f66 Mon Sep 17 00:00:00 2001 From: Andras Lasso Date: Tue, 20 Dec 2016 14:29:09 +0000 Subject: [PATCH 5/6] re #1010: Fixed comments in build scripts --- PlusBuild/PlusBuildAndTest.bat.in | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/PlusBuild/PlusBuildAndTest.bat.in b/PlusBuild/PlusBuildAndTest.bat.in index 3a98da4f9..bbd9d79a5 100644 --- a/PlusBuild/PlusBuildAndTest.bat.in +++ b/PlusBuild/PlusBuildAndTest.bat.in @@ -1,16 +1,12 @@ - @ECHO off -REM Hide all your directories from users - -REM Input parameters: -REM if "%1" == "" goto experimental -REM if "%1" == "-E" goto experimental -REM if "%1" == "-N" goto nightly -REM if "%1" == "-C" goto continuous -REM if "%1" == "-I" goto individual +REM Update and run all tests +REM Arguments: [mode] +REM mode: +REM -E experimental (default) +REM -N nightly +REM -C continuous @REM Run PlusBuild tests -@REM Run PlusLib tests cd /d "${CMAKE_CURRENT_BINARY_DIR}" call BuildAndTest.bat %1 @@ -22,4 +18,4 @@ call BuildAndTest.bat %1 cd /d "${PLUSBUILD_BIN_DIR_WIN}\PlusApp-bin" call BuildAndTest.bat %1 -cd /d "${PLUSBUILD_BIN_DIR_WIN}" \ No newline at end of file +cd /d "${PLUSBUILD_BIN_DIR_WIN}" From 09fecad9952911818bccc5d648ca6378d7e4e1ab Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 27 Jan 2017 10:57:17 -0500 Subject: [PATCH 6/6] re #1059 moving branch folders to top level of branch --- PlusBuild/BuildAndTest.bat.in => BuildAndTest.bat.in | 0 PlusBuild/BuildAndTest.sh.in => BuildAndTest.sh.in | 0 PlusBuild/CMakeLists.txt => CMakeLists.txt | 0 PlusBuild/CTestConfig.cmake => CTestConfig.cmake | 0 .../External_BiiGOptitrack.cmake => External_BiiGOptitrack.cmake | 0 PlusBuild/External_GrabbieLib.cmake => External_GrabbieLib.cmake | 0 PlusBuild/External_ITK.cmake => External_ITK.cmake | 0 ...External_IntersonSDKCxx.cmake => External_IntersonSDKCxx.cmake | 0 .../External_OpenIGTLink.cmake => External_OpenIGTLink.cmake | 0 PlusBuild/External_PlusApp.cmake => External_PlusApp.cmake | 0 PlusBuild/External_PlusLib.cmake => External_PlusLib.cmake | 0 .../External_PlusLibData.cmake => External_PlusLibData.cmake | 0 ...rnal_PlusModelCatalog.cmake => External_PlusModelCatalog.cmake | 0 PlusBuild/External_Tesseract.cmake => External_Tesseract.cmake | 0 PlusBuild/External_VTK.cmake => External_VTK.cmake | 0 {PlusBuild/Modules => Modules}/FindCapistrano.cmake | 0 {PlusBuild/Modules => Modules}/FindICCapturing.cmake | 0 {PlusBuild/Modules => Modules}/FindInterson.cmake | 0 {PlusBuild/Modules => Modules}/FindIntuitiveDaVinci.cmake | 0 {PlusBuild/Modules => Modules}/FindMicronTracker.cmake | 0 {PlusBuild/Modules => Modules}/FindNDIOAPI.cmake | 0 {PlusBuild/Modules => Modules}/FindOptimetSmart32SDK.cmake | 0 {PlusBuild/Modules => Modules}/FindPhilips.cmake | 0 {PlusBuild/Modules => Modules}/FindRSSDK.cmake | 0 {PlusBuild/Modules => Modules}/FindSTEALTHLINK.cmake | 0 {PlusBuild/Modules => Modules}/FindTelemed.cmake | 0 {PlusBuild/Modules => Modules}/FindThorLabs.cmake | 0 {PlusBuild/Modules => Modules}/FindTrackingTools.cmake | 0 {PlusBuild/Modules => Modules}/FindULTRASONIX_SDK.cmake | 0 {PlusBuild/Modules => Modules}/FindWindowsSDK.cmake | 0 {PlusBuild/Modules => Modules}/PlusTestWindowsSdkCompatible.cxx | 0 {PlusBuild/Modules => Modules}/TestWindowsSDK.cmake | 0 PlusBuild/PlusBuildAndTest.bat.in => PlusBuildAndTest.bat.in | 0 PlusBuild/PlusBuildAndTest.sh.in => PlusBuildAndTest.sh.in | 0 34 files changed, 0 insertions(+), 0 deletions(-) rename PlusBuild/BuildAndTest.bat.in => BuildAndTest.bat.in (100%) rename PlusBuild/BuildAndTest.sh.in => BuildAndTest.sh.in (100%) rename PlusBuild/CMakeLists.txt => CMakeLists.txt (100%) rename PlusBuild/CTestConfig.cmake => CTestConfig.cmake (100%) rename PlusBuild/External_BiiGOptitrack.cmake => External_BiiGOptitrack.cmake (100%) rename PlusBuild/External_GrabbieLib.cmake => External_GrabbieLib.cmake (100%) rename PlusBuild/External_ITK.cmake => External_ITK.cmake (100%) rename PlusBuild/External_IntersonSDKCxx.cmake => External_IntersonSDKCxx.cmake (100%) rename PlusBuild/External_OpenIGTLink.cmake => External_OpenIGTLink.cmake (100%) rename PlusBuild/External_PlusApp.cmake => External_PlusApp.cmake (100%) rename PlusBuild/External_PlusLib.cmake => External_PlusLib.cmake (100%) rename PlusBuild/External_PlusLibData.cmake => External_PlusLibData.cmake (100%) rename PlusBuild/External_PlusModelCatalog.cmake => External_PlusModelCatalog.cmake (100%) rename PlusBuild/External_Tesseract.cmake => External_Tesseract.cmake (100%) rename PlusBuild/External_VTK.cmake => External_VTK.cmake (100%) rename {PlusBuild/Modules => Modules}/FindCapistrano.cmake (100%) rename {PlusBuild/Modules => Modules}/FindICCapturing.cmake (100%) rename {PlusBuild/Modules => Modules}/FindInterson.cmake (100%) rename {PlusBuild/Modules => Modules}/FindIntuitiveDaVinci.cmake (100%) rename {PlusBuild/Modules => Modules}/FindMicronTracker.cmake (100%) rename {PlusBuild/Modules => Modules}/FindNDIOAPI.cmake (100%) rename {PlusBuild/Modules => Modules}/FindOptimetSmart32SDK.cmake (100%) rename {PlusBuild/Modules => Modules}/FindPhilips.cmake (100%) rename {PlusBuild/Modules => Modules}/FindRSSDK.cmake (100%) rename {PlusBuild/Modules => Modules}/FindSTEALTHLINK.cmake (100%) rename {PlusBuild/Modules => Modules}/FindTelemed.cmake (100%) rename {PlusBuild/Modules => Modules}/FindThorLabs.cmake (100%) rename {PlusBuild/Modules => Modules}/FindTrackingTools.cmake (100%) rename {PlusBuild/Modules => Modules}/FindULTRASONIX_SDK.cmake (100%) rename {PlusBuild/Modules => Modules}/FindWindowsSDK.cmake (100%) rename {PlusBuild/Modules => Modules}/PlusTestWindowsSdkCompatible.cxx (100%) rename {PlusBuild/Modules => Modules}/TestWindowsSDK.cmake (100%) rename PlusBuild/PlusBuildAndTest.bat.in => PlusBuildAndTest.bat.in (100%) rename PlusBuild/PlusBuildAndTest.sh.in => PlusBuildAndTest.sh.in (100%) diff --git a/PlusBuild/BuildAndTest.bat.in b/BuildAndTest.bat.in similarity index 100% rename from PlusBuild/BuildAndTest.bat.in rename to BuildAndTest.bat.in diff --git a/PlusBuild/BuildAndTest.sh.in b/BuildAndTest.sh.in similarity index 100% rename from PlusBuild/BuildAndTest.sh.in rename to BuildAndTest.sh.in diff --git a/PlusBuild/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from PlusBuild/CMakeLists.txt rename to CMakeLists.txt diff --git a/PlusBuild/CTestConfig.cmake b/CTestConfig.cmake similarity index 100% rename from PlusBuild/CTestConfig.cmake rename to CTestConfig.cmake diff --git a/PlusBuild/External_BiiGOptitrack.cmake b/External_BiiGOptitrack.cmake similarity index 100% rename from PlusBuild/External_BiiGOptitrack.cmake rename to External_BiiGOptitrack.cmake diff --git a/PlusBuild/External_GrabbieLib.cmake b/External_GrabbieLib.cmake similarity index 100% rename from PlusBuild/External_GrabbieLib.cmake rename to External_GrabbieLib.cmake diff --git a/PlusBuild/External_ITK.cmake b/External_ITK.cmake similarity index 100% rename from PlusBuild/External_ITK.cmake rename to External_ITK.cmake diff --git a/PlusBuild/External_IntersonSDKCxx.cmake b/External_IntersonSDKCxx.cmake similarity index 100% rename from PlusBuild/External_IntersonSDKCxx.cmake rename to External_IntersonSDKCxx.cmake diff --git a/PlusBuild/External_OpenIGTLink.cmake b/External_OpenIGTLink.cmake similarity index 100% rename from PlusBuild/External_OpenIGTLink.cmake rename to External_OpenIGTLink.cmake diff --git a/PlusBuild/External_PlusApp.cmake b/External_PlusApp.cmake similarity index 100% rename from PlusBuild/External_PlusApp.cmake rename to External_PlusApp.cmake diff --git a/PlusBuild/External_PlusLib.cmake b/External_PlusLib.cmake similarity index 100% rename from PlusBuild/External_PlusLib.cmake rename to External_PlusLib.cmake diff --git a/PlusBuild/External_PlusLibData.cmake b/External_PlusLibData.cmake similarity index 100% rename from PlusBuild/External_PlusLibData.cmake rename to External_PlusLibData.cmake diff --git a/PlusBuild/External_PlusModelCatalog.cmake b/External_PlusModelCatalog.cmake similarity index 100% rename from PlusBuild/External_PlusModelCatalog.cmake rename to External_PlusModelCatalog.cmake diff --git a/PlusBuild/External_Tesseract.cmake b/External_Tesseract.cmake similarity index 100% rename from PlusBuild/External_Tesseract.cmake rename to External_Tesseract.cmake diff --git a/PlusBuild/External_VTK.cmake b/External_VTK.cmake similarity index 100% rename from PlusBuild/External_VTK.cmake rename to External_VTK.cmake diff --git a/PlusBuild/Modules/FindCapistrano.cmake b/Modules/FindCapistrano.cmake similarity index 100% rename from PlusBuild/Modules/FindCapistrano.cmake rename to Modules/FindCapistrano.cmake diff --git a/PlusBuild/Modules/FindICCapturing.cmake b/Modules/FindICCapturing.cmake similarity index 100% rename from PlusBuild/Modules/FindICCapturing.cmake rename to Modules/FindICCapturing.cmake diff --git a/PlusBuild/Modules/FindInterson.cmake b/Modules/FindInterson.cmake similarity index 100% rename from PlusBuild/Modules/FindInterson.cmake rename to Modules/FindInterson.cmake diff --git a/PlusBuild/Modules/FindIntuitiveDaVinci.cmake b/Modules/FindIntuitiveDaVinci.cmake similarity index 100% rename from PlusBuild/Modules/FindIntuitiveDaVinci.cmake rename to Modules/FindIntuitiveDaVinci.cmake diff --git a/PlusBuild/Modules/FindMicronTracker.cmake b/Modules/FindMicronTracker.cmake similarity index 100% rename from PlusBuild/Modules/FindMicronTracker.cmake rename to Modules/FindMicronTracker.cmake diff --git a/PlusBuild/Modules/FindNDIOAPI.cmake b/Modules/FindNDIOAPI.cmake similarity index 100% rename from PlusBuild/Modules/FindNDIOAPI.cmake rename to Modules/FindNDIOAPI.cmake diff --git a/PlusBuild/Modules/FindOptimetSmart32SDK.cmake b/Modules/FindOptimetSmart32SDK.cmake similarity index 100% rename from PlusBuild/Modules/FindOptimetSmart32SDK.cmake rename to Modules/FindOptimetSmart32SDK.cmake diff --git a/PlusBuild/Modules/FindPhilips.cmake b/Modules/FindPhilips.cmake similarity index 100% rename from PlusBuild/Modules/FindPhilips.cmake rename to Modules/FindPhilips.cmake diff --git a/PlusBuild/Modules/FindRSSDK.cmake b/Modules/FindRSSDK.cmake similarity index 100% rename from PlusBuild/Modules/FindRSSDK.cmake rename to Modules/FindRSSDK.cmake diff --git a/PlusBuild/Modules/FindSTEALTHLINK.cmake b/Modules/FindSTEALTHLINK.cmake similarity index 100% rename from PlusBuild/Modules/FindSTEALTHLINK.cmake rename to Modules/FindSTEALTHLINK.cmake diff --git a/PlusBuild/Modules/FindTelemed.cmake b/Modules/FindTelemed.cmake similarity index 100% rename from PlusBuild/Modules/FindTelemed.cmake rename to Modules/FindTelemed.cmake diff --git a/PlusBuild/Modules/FindThorLabs.cmake b/Modules/FindThorLabs.cmake similarity index 100% rename from PlusBuild/Modules/FindThorLabs.cmake rename to Modules/FindThorLabs.cmake diff --git a/PlusBuild/Modules/FindTrackingTools.cmake b/Modules/FindTrackingTools.cmake similarity index 100% rename from PlusBuild/Modules/FindTrackingTools.cmake rename to Modules/FindTrackingTools.cmake diff --git a/PlusBuild/Modules/FindULTRASONIX_SDK.cmake b/Modules/FindULTRASONIX_SDK.cmake similarity index 100% rename from PlusBuild/Modules/FindULTRASONIX_SDK.cmake rename to Modules/FindULTRASONIX_SDK.cmake diff --git a/PlusBuild/Modules/FindWindowsSDK.cmake b/Modules/FindWindowsSDK.cmake similarity index 100% rename from PlusBuild/Modules/FindWindowsSDK.cmake rename to Modules/FindWindowsSDK.cmake diff --git a/PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx b/Modules/PlusTestWindowsSdkCompatible.cxx similarity index 100% rename from PlusBuild/Modules/PlusTestWindowsSdkCompatible.cxx rename to Modules/PlusTestWindowsSdkCompatible.cxx diff --git a/PlusBuild/Modules/TestWindowsSDK.cmake b/Modules/TestWindowsSDK.cmake similarity index 100% rename from PlusBuild/Modules/TestWindowsSDK.cmake rename to Modules/TestWindowsSDK.cmake diff --git a/PlusBuild/PlusBuildAndTest.bat.in b/PlusBuildAndTest.bat.in similarity index 100% rename from PlusBuild/PlusBuildAndTest.bat.in rename to PlusBuildAndTest.bat.in diff --git a/PlusBuild/PlusBuildAndTest.sh.in b/PlusBuildAndTest.sh.in similarity index 100% rename from PlusBuild/PlusBuildAndTest.sh.in rename to PlusBuildAndTest.sh.in