Skip to content
Snippets Groups Projects
Commit 842563df authored by Jean-Baptiste Keck's avatar Jean-Baptiste Keck
Browse files

Merge branch '46-add-python3-x-support' of...

Merge branch '46-add-python3-x-support' of gricad-gitlab.univ-grenoble-alpes.fr:particle_methods/hysop into 46-add-python3-x-support
parents 77a23ab7 3ad3b690
No related branches found
No related tags found
2 merge requests!24Resolve "Add python3.x support",!15WIP: Resolve "HySoP with tasks"
Pipeline #52334 canceled
...@@ -80,7 +80,7 @@ function(set_python_install_path) ...@@ -80,7 +80,7 @@ function(set_python_install_path)
# list depends on the OS, the python version ... # list depends on the OS, the python version ...
configure_file(cmake/fake/setup.py tmp/setup.py) configure_file(cmake/fake/setup.py tmp/setup.py)
configure_file(cmake/fake/__init__.py tmp/fake/__init__.py) configure_file(cmake/fake/__init__.py tmp/fake/__init__.py)
configure_file(cmake/find_python_install.py tmp/find_python_install.py) configure_file(cmake/find_python_install.py.in tmp/find_python_install.py)
execute_process( execute_process(
COMMAND ${PYTHON_EXECUTABLE} find_python_install.py COMMAND ${PYTHON_EXECUTABLE} find_python_install.py
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tmp/ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tmp/
......
...@@ -5,7 +5,7 @@ import locale ...@@ -5,7 +5,7 @@ import locale
encoding = locale.getdefaultlocale()[1] encoding = locale.getdefaultlocale()[1]
output = subprocess.Popen(["python", "setup.py", "--dry-run", "install"], output = subprocess.Popen(["@PYTHON_EXECUTABLE@", "setup.py", "--dry-run", "install"],
stdout=subprocess.PIPE).communicate()[0] stdout=subprocess.PIPE).communicate()[0]
if encoding: if encoding:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment