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
25f0ab83
Commit
25f0ab83
authored
Aug 20, 2015
by
Ehsan Azarnasab
Browse files
only check cmake existence if building in required
parent
93818fd7
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
setup.py
setup.py
+4
-4
No files found.
setup.py
View file @
25f0ab83
...
@@ -122,9 +122,6 @@ def _get_options():
...
@@ -122,9 +122,6 @@ def _get_options():
options
,
cmake_config
,
cmake_path
,
cmake_extra
=
_get_options
()
options
,
cmake_config
,
cmake_path
,
cmake_extra
=
_get_options
()
if
cmake_path
is
None
:
raise
DistutilsSetupError
(
"Cannot find cmake in the path. Please specify its path with --cmake parameter."
)
try
:
try
:
from
Queue
import
Queue
,
Empty
from
Queue
import
Queue
,
Empty
except
ImportError
:
except
ImportError
:
...
@@ -305,6 +302,9 @@ class build(_build):
...
@@ -305,6 +302,9 @@ class build(_build):
def
build_dlib
():
def
build_dlib
():
"""use cmake to build and install the extension
"""use cmake to build and install the extension
"""
"""
if
cmake_path
is
None
:
raise
DistutilsSetupError
(
"Cannot find cmake in the path. Please specify its path with --cmake parameter."
)
platform_arch
=
platform
.
architecture
()[
0
]
platform_arch
=
platform
.
architecture
()[
0
]
log
.
info
(
"Detected Python architecture: %s"
%
platform_arch
)
log
.
info
(
"Detected Python architecture: %s"
%
platform_arch
)
...
...
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