Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
c22bedc1
Commit
c22bedc1
authored
Dec 27, 2016
by
hiiwave
Committed by
Davis E. King
Dec 27, 2016
Browse files
Modify setup.py so that it can be installed under conda environment (#377)
parent
2f91cd6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
setup.py
setup.py
+9
-1
No files found.
setup.py
View file @
c22bedc1
...
@@ -355,7 +355,7 @@ def read_version():
...
@@ -355,7 +355,7 @@ def read_version():
major
=
re
.
findall
(
"set\(CPACK_PACKAGE_VERSION_MAJOR.*
\"
(.*)
\"
"
,
open
(
'dlib/CMakeLists.txt'
).
read
())[
0
]
major
=
re
.
findall
(
"set\(CPACK_PACKAGE_VERSION_MAJOR.*
\"
(.*)
\"
"
,
open
(
'dlib/CMakeLists.txt'
).
read
())[
0
]
minor
=
re
.
findall
(
"set\(CPACK_PACKAGE_VERSION_MINOR.*
\"
(.*)
\"
"
,
open
(
'dlib/CMakeLists.txt'
).
read
())[
0
]
minor
=
re
.
findall
(
"set\(CPACK_PACKAGE_VERSION_MINOR.*
\"
(.*)
\"
"
,
open
(
'dlib/CMakeLists.txt'
).
read
())[
0
]
patch
=
re
.
findall
(
"set\(CPACK_PACKAGE_VERSION_PATCH.*
\"
(.*)
\"
"
,
open
(
'dlib/CMakeLists.txt'
).
read
())[
0
]
patch
=
re
.
findall
(
"set\(CPACK_PACKAGE_VERSION_PATCH.*
\"
(.*)
\"
"
,
open
(
'dlib/CMakeLists.txt'
).
read
())[
0
]
return
major
+
'.'
+
minor
+
'.'
+
patch
return
major
+
'.'
+
minor
+
'.'
+
patch
def
rmtree
(
name
):
def
rmtree
(
name
):
...
@@ -504,6 +504,14 @@ class build(_build):
...
@@ -504,6 +504,14 @@ class build(_build):
# make sure build artifacts are generated for the version of Python currently running
# make sure build artifacts are generated for the version of Python currently running
cmake_extra_arch
=
[]
cmake_extra_arch
=
[]
if
'conda'
in
sys
.
version
:
# to support conda distribution
from
distutils.sysconfig
import
get_python_inc
import
distutils.sysconfig
as
sysconfig
cmake_extra_arch
+=
[
'-DPYTHON_INCLUDE_DIR='
+
get_python_inc
()]
cmake_extra_arch
+=
[
'-DPYTHON_LIBRARY='
+
sysconfig
.
get_config_var
(
'LIBDIR'
)]
if
sys
.
version_info
>=
(
3
,
0
):
if
sys
.
version_info
>=
(
3
,
0
):
cmake_extra_arch
+=
[
'-DPYTHON3=yes'
]
cmake_extra_arch
+=
[
'-DPYTHON3=yes'
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment