Mercurial > hg > orthanc
changeset 6076:7a983a005931
cleanup
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Wed, 02 Apr 2025 17:44:09 +0200 |
| parents | 89fe8a841876 |
| children | 836d8b432ae3 |
| files | OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake OrthancServer/Plugins/Samples/Common/OrthancPlugins.cmake |
| diffstat | 3 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake Wed Apr 02 17:32:39 2025 +0200 +++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake Wed Apr 02 17:44:09 2025 +0200 @@ -504,6 +504,7 @@ if(CMAKE_VERSION VERSION_GREATER "3.11") find_package(Python REQUIRED COMPONENTS Interpreter) + set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) else() include(FindPythonInterp) find_package(PythonInterp REQUIRED)
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Apr 02 17:32:39 2025 +0200 +++ b/OrthancFramework/Resources/CMake/OrthancFrameworkConfiguration.cmake Wed Apr 02 17:44:09 2025 +0200 @@ -44,16 +44,12 @@ include(CheckSymbolExists) include(CheckTypeSize) -message(WARNING "CMAKE_VERSION: '${CMAKE_VERSION}'") if(CMAKE_VERSION VERSION_GREATER "3.11") find_package(Python REQUIRED COMPONENTS Interpreter) - message(WARNING "PYTHON_EXECUTABLE (1): '${PYTHON_EXECUTABLE}'") - message(WARNING "Python_EXECUTABLE (1): '${Python_EXECUTABLE}'") set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) else() include(FindPythonInterp) find_package(PythonInterp REQUIRED) - message(WARNING "Python Executable (2): '${PYTHON_EXECUTABLE}'") endif() include(${CMAKE_CURRENT_LIST_DIR}/AutoGeneratedCode.cmake)
--- a/OrthancServer/Plugins/Samples/Common/OrthancPlugins.cmake Wed Apr 02 17:32:39 2025 +0200 +++ b/OrthancServer/Plugins/Samples/Common/OrthancPlugins.cmake Wed Apr 02 17:44:09 2025 +0200 @@ -25,6 +25,7 @@ if(CMAKE_VERSION VERSION_GREATER "3.11") find_package(Python REQUIRED COMPONENTS Interpreter) + set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) else() include(FindPythonInterp) find_package(PythonInterp REQUIRED)