From 5963dbd92ab0a6ef6ed752a21bb34cea9689a2c9 Mon Sep 17 00:00:00 2001 From: NicoleJurjew Date: Wed, 2 Oct 2024 17:39:42 +0100 Subject: [PATCH 1/3] Updated updated modules in find_package command for Python3 --- SuperBuild.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SuperBuild.cmake b/SuperBuild.cmake index 9f76150c..b081f14a 100644 --- a/SuperBuild.cmake +++ b/SuperBuild.cmake @@ -47,7 +47,7 @@ endif() # Find CUDA option(DISABLE_CUDA "Disable CUDA" OFF) if (NOT DISABLE_CUDA) - find_package(CUDA) + find_package(CUDAToolkit REQUIRED) endif() if (NOT DISABLE_CUDA AND CUDA_FOUND) message(STATUS "<<<<<<<<<<<<<<<<< CUDA FOUND >>>>>>>>>>>>>>>>>>>>>") @@ -96,23 +96,23 @@ if (DISABLE_PYTHON) else() # only Python 3 is supported - find_package(PythonInterp 3) + find_package(Python3 REQUIRED COMPONENTS Interpreter Development) - if (PYTHONINTERP_FOUND) + # Check if Python3 was found and output the details + if (Python3_FOUND) set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_STRING}) - message(STATUS "Found PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}") + message(STATUS "Found PYTHON_EXECUTABLE=${Python3_EXECUTABLE}") + set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) message(STATUS "Python version ${PYTHON_VERSION_STRING}") endif() - find_package(PythonLibs 3) - if (PYTHONLIBS_FOUND) message(STATUS "Found PYTHON_INCLUDE_DIRS=${PYTHON_INCLUDE_DIRS}") message(STATUS "Found PYTHON_LIBRARIES=${PYTHON_LIBRARIES}") endif() # Set destinations for Python files - set (BUILD_PYTHON ${PYTHONLIBS_FOUND}) + set (BUILD_PYTHON = ${Python3_FOUND}) if (BUILD_PYTHON) set(PYTHON_DEST_DIR "" CACHE PATH "Directory of the Python modules (if not set, use ${CMAKE_INSTALL_PREFIX}/python)") if (PYTHON_DEST_DIR) From 50805ce182d3108f20a2623927a7cc6695adacbb Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Thu, 3 Oct 2024 09:36:40 +0100 Subject: [PATCH 2/3] revert change in finding CUDA --- SuperBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild.cmake b/SuperBuild.cmake index b081f14a..c38127eb 100644 --- a/SuperBuild.cmake +++ b/SuperBuild.cmake @@ -47,7 +47,7 @@ endif() # Find CUDA option(DISABLE_CUDA "Disable CUDA" OFF) if (NOT DISABLE_CUDA) - find_package(CUDAToolkit REQUIRED) + find_package(CUDA) endif() if (NOT DISABLE_CUDA AND CUDA_FOUND) message(STATUS "<<<<<<<<<<<<<<<<< CUDA FOUND >>>>>>>>>>>>>>>>>>>>>") From 1fabcc0bffa582ff2ff87bafb05718dfb44c65ca Mon Sep 17 00:00:00 2001 From: Kris Thielemans Date: Thu, 3 Oct 2024 09:37:40 +0100 Subject: [PATCH 3/3] correct typo --- SuperBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SuperBuild.cmake b/SuperBuild.cmake index c38127eb..81990107 100644 --- a/SuperBuild.cmake +++ b/SuperBuild.cmake @@ -112,7 +112,7 @@ else() endif() # Set destinations for Python files - set (BUILD_PYTHON = ${Python3_FOUND}) + set (BUILD_PYTHON ${Python3_FOUND}) if (BUILD_PYTHON) set(PYTHON_DEST_DIR "" CACHE PATH "Directory of the Python modules (if not set, use ${CMAKE_INSTALL_PREFIX}/python)") if (PYTHON_DEST_DIR)