Skip to content

Added work around getsitepackages Issue #715 #1031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2018
Merged

Added work around getsitepackages Issue #715 #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildsystem/HandlePythonOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2015-2017 the openage authors. See copying.md for legal info.
# Copyright 2015-2018 the openage authors. See copying.md for legal info.

# finds the python interpreter, install destination and extension flags.

Expand Down Expand Up @@ -29,7 +29,7 @@ if(NOT CMAKE_PY_INSTALL_PREFIX)
if(MSVC)
set(CMAKE_PY_INSTALL_PREFIX "python")
else()
py_exec("import site, os; print(os.path.normpath(site.getsitepackages()[0]))" PREFIX)
py_exec("from distutils.sysconfig import get_python_lib; print(get_python_lib())" PREFIX)
set(CMAKE_PY_INSTALL_PREFIX "${PREFIX}")
endif()
endif()
3 changes: 2 additions & 1 deletion copying.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Any file in this project that doesn't state otherwise, and isn't listed as an
exception below, is Copyright 2013-2017 The openage authors, and licensed
exception below, is Copyright 2013-2018 The openage authors, and licensed
under the terms of the GNU General Public License Version 3, or
(at your option) any later version ("GPL3+").
A copy of the license can be found in [legal/GPLV3](/legal/GPLv3).
Expand Down Expand Up @@ -113,6 +113,7 @@ _the openage authors_ are:
| Andrew Thompson           | [email protected] | mrwerdo331 à me dawt com |
| Benedikt Freisen | roybaer | b dawt freisen à gmx dawt net |
| Finn Günther | Kawzeg | kawzeg à gmail dawt com |
| Akshit Sharma | akshit-sharma | akshit9sharma à gmail dawt com |

If you're a first-time committer, add yourself to the above list. This is not
just for legal reasons, but also to keep an overview of all those nicknames.
Expand Down