From 8a3645c018dc5e82af72894f667b32fca9d9d8db Mon Sep 17 00:00:00 2001 From: "BEELZEBUB\\DIS" Date: Fri, 23 Feb 2024 15:47:24 +0100 Subject: [PATCH] Python upped to 3.11 PCL upped to 1.14 Realsense upped to 2.54 OpenCV opped to 4.9 --- CMakeLists.txt | 5 ++++- cwipc_util | 2 +- scripts/install-3rdparty-full-win1064.ps1 | 20 ++++++++++---------- scripts/install-3rdparty-osx1015.sh | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 424bd79..d00cc01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,10 @@ endif() if(APPLE) find_package(Python3 3.10 EXACT REQUIRED COMPONENTS Interpreter) else() - find_package(Python3 3.9...<3.11 REQUIRED COMPONENTS Interpreter) + # The upper limit on the Python version is caused by opencv and open3d, + # which can lag behind some times. As soon as those packages are available + # for a new release of Python we can update this version. + find_package(Python3 3.9...<3.12 REQUIRED COMPONENTS Interpreter) endif() # # Now we can setup the venv. diff --git a/cwipc_util b/cwipc_util index 1e1e60e..b566313 160000 --- a/cwipc_util +++ b/cwipc_util @@ -1 +1 @@ -Subproject commit 1e1e60ec9b3f2e6c8e98c2b0ec33f2e0f813707a +Subproject commit b5663135341e576dcf5d9b01e4fc39d89f270540 diff --git a/scripts/install-3rdparty-full-win1064.ps1 b/scripts/install-3rdparty-full-win1064.ps1 index 8643403..a753dbe 100644 --- a/scripts/install-3rdparty-full-win1064.ps1 +++ b/scripts/install-3rdparty-full-win1064.ps1 @@ -106,12 +106,12 @@ if($ok) { Write-Output "pcl: already installed" } else { Write-Output "pcl: downloading..." - $installer="$tmpinstalldir\PCL-1.13.0-AllInOne-msvc2022-win64.exe" - (New-Object System.Net.WebClient).DownloadFile("https://github.com/PointCloudLibrary/pcl/releases/download/pcl-1.13.0/PCL-1.13.0-AllInOne-msvc2022-win64.exe",$installer); + $installer="$tmpinstalldir\PCL-1.14.0-AllInOne-msvc2022-win64.exe" + (New-Object System.Net.WebClient).DownloadFile("https://github.com/PointCloudLibrary/pcl/releases/download/pcl-1.14.0/PCL-1.14.0-AllInOne-msvc2022-win64.exe",$installer); Write-Output "pcl: installing..." Start-Process -FilePath $installer -ArgumentList "/S" -Wait - Add-PathVariable("C:\Program Files\PCL 1.13.0\bin") - Add-PathVariable("C:\Program Files\PCL 1.13.0\3rdParty\VTK\bin") + Add-PathVariable("C:\Program Files\PCL 1.14.0\bin") + Add-PathVariable("C:\Program Files\PCL 1.14.0\3rdParty\VTK\bin") Add-PathVariable("C:\Program Files\OpenNI2\Redist") Write-Output "pcl: installed" } @@ -124,9 +124,9 @@ if($ok) { Write-Output "intel-realsense: already installed" } else { Write-Output "intel-realsense: downloading..." - $installer="$tmpinstalldir\Intel.RealSense.SDK-WIN10-2.53.1.4623.exe" + $installer="$tmpinstalldir\Intel.RealSense.SDK-WIN10-2.54.2.5684.exe" (New-Object System.Net.WebClient).DownloadFile( - "https://github.com/IntelRealSense/librealsense/releases/download/v2.53.1/Intel.RealSense.SDK-WIN10-2.53.1.4623.exe",$installer); + "https://github.com/IntelRealSense/librealsense/releases/download/v2.52.2/Intel.RealSense.SDK-WIN10-2.52.2.5684.exe",$installer); Write-Output "intel-realsense: installing..." Start-Process -FilePath $installer -ArgumentList '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /NOCANCEL /SP-' -Wait Add-PathVariable("C:\Program Files (x86)\Intel RealSense SDK 2.0\bin\x64") @@ -172,8 +172,8 @@ if($ok) { Write-Output "opencv: already installed" } else { Write-Output "opencv: downloading..." - $installer="$tmpinstalldir\opencv-4.7.0-windows.exe" - (New-Object System.Net.WebClient).DownloadFile("https://github.com/opencv/opencv/releases/download/4.7.0/opencv-4.7.0-windows.exe",$installer); + $installer="$tmpinstalldir\opencv-4.9.0-windows.exe" + (New-Object System.Net.WebClient).DownloadFile("https://github.com/opencv/opencv/releases/download/4.9.0/opencv-4.9.0-windows.exe",$installer); Write-Output "opencv: installing..." Start-Process $installer -ArgumentList '-o"C:\" -y' -Wait Add-PathVariable("C:\opencv\build\bin") @@ -197,8 +197,8 @@ if($ok) { Write-Output "python: already installed" } else { Write-Output "python: downloading..." - $installer="$tmpinstalldir\python-3.10.10-amd64.exe" - (New-Object System.Net.WebClient).DownloadFile("https://www.python.org/ftp/python/3.10.10/python-3.10.10-amd64.exe",$installer); + $installer="$tmpinstalldir\python-3.11.8-amd64.exe" + (New-Object System.Net.WebClient).DownloadFile("https://www.python.org/ftp/python/3.11.8/python-3.11.8-amd64.exe",$installer); Write-Output "python: installing..." Start-Process -FilePath $installer -ArgumentList '/quiet InstallAllUsers=1 PrependPath=1' -Wait Write-Output "python: installed" diff --git a/scripts/install-3rdparty-osx1015.sh b/scripts/install-3rdparty-osx1015.sh index e7d2506..1e844ba 100755 --- a/scripts/install-3rdparty-osx1015.sh +++ b/scripts/install-3rdparty-osx1015.sh @@ -2,8 +2,8 @@ set -x brew install pkg-config || brew upgrade pkg-config brew install cmake || brew upgrade cmake brew install pcl || brew upgrade pcl -brew install python@3.10 || brew upgrade python@3.10 -brew link python@3.10 +brew install python@3.11 || brew upgrade python@3.11 +brew link python@3.11 brew install pkg-config || brew upgrade pkg-config brew install homebrew/core/glfw3 || brew upgrade homebrew/core/glfw3 brew install librealsense || brew upgrade librealsense