Commit 60d97580 authored by Guillaume Pasero's avatar Guillaume Pasero

ENH: handle separate python3 variables

parent efa8f7ba
...@@ -145,6 +145,9 @@ endif() ...@@ -145,6 +145,9 @@ endif()
if(NOT OTB_INSTALL_PYTHON_DIR) if(NOT OTB_INSTALL_PYTHON_DIR)
set(OTB_INSTALL_PYTHON_DIR "lib/otb/python") set(OTB_INSTALL_PYTHON_DIR "lib/otb/python")
endif() endif()
if(NOT OTB_INSTALL_PYTHON3_DIR)
set(OTB_INSTALL_PYTHON3_DIR "lib/otb/python3")
endif()
if(NOT OTB_INSTALL_JAVA_DIR) if(NOT OTB_INSTALL_JAVA_DIR)
set(OTB_INSTALL_JAVA_DIR "lib/otb/java") set(OTB_INSTALL_JAVA_DIR "lib/otb/java")
endif() endif()
......
...@@ -82,6 +82,9 @@ if ( OTB_WRAP_PYTHON3 ) ...@@ -82,6 +82,9 @@ if ( OTB_WRAP_PYTHON3 )
swap_cache_variable(NUMPY_INCLUDE_DIR NUMPY_PYTHON3_INCLUDE_DIR) swap_cache_variable(NUMPY_INCLUDE_DIR NUMPY_PYTHON3_INCLUDE_DIR)
swap_variable(PYTHON_LIBRARIES PYTHON3_LIBRARIES) swap_variable(PYTHON_LIBRARIES PYTHON3_LIBRARIES)
swap_variable(NUMPY_INCLUDE_DIRS NUMPY_PYTHON3_INCLUDE_DIRS)
swap_variable(NUMPY_FOUND NUMPY_PYTHON3_FOUND)
swap_variable(PYTHON_VERSION_STRING PYTHON3_VERSION_STRING)
check_PIC_flag ( Python ) check_PIC_flag ( Python )
find_package ( PythonInterp 3 REQUIRED ) find_package ( PythonInterp 3 REQUIRED )
...@@ -97,6 +100,9 @@ if ( OTB_WRAP_PYTHON3 ) ...@@ -97,6 +100,9 @@ if ( OTB_WRAP_PYTHON3 )
swap_cache_variable(NUMPY_INCLUDE_DIR NUMPY_PYTHON3_INCLUDE_DIR) swap_cache_variable(NUMPY_INCLUDE_DIR NUMPY_PYTHON3_INCLUDE_DIR)
swap_variable(PYTHON_LIBRARIES PYTHON3_LIBRARIES) swap_variable(PYTHON_LIBRARIES PYTHON3_LIBRARIES)
swap_variable(NUMPY_INCLUDE_DIRS NUMPY_PYTHON3_INCLUDE_DIRS)
swap_variable(NUMPY_FOUND NUMPY_PYTHON3_FOUND)
swap_variable(PYTHON_VERSION_STRING PYTHON3_VERSION_STRING)
endif() endif()
# #
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment