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
cdce208e
"git@developer.sourcefind.cn:change/sglang.git" did not exist on "4dbf43601d49d1c62018b62c377aa4560d492394"
Commit
cdce208e
authored
Aug 26, 2015
by
Ehsan Azarnasab
Browse files
cannot automatically select Win64 toolchain on Windows by setting simple flags
parent
6e2ed37f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
7 deletions
+4
-7
setup.py
setup.py
+4
-7
No files found.
setup.py
View file @
cdce208e
...
...
@@ -65,6 +65,7 @@ def _get_options():
_options
=
[]
opt_key
=
None
_generator_set
=
False
# if a build generator is set
argv
=
[
arg
for
arg
in
sys
.
argv
]
# take a copy
# parse commandline options and consume those we care about
...
...
@@ -77,6 +78,7 @@ def _get_options():
_cmake_extra
.
append
(
'-D{arg}=no'
.
format
(
arg
=
arg
.
strip
()))
elif
opt_key
==
'G'
:
_cmake_extra
+=
[
'-G'
,
arg
.
strip
()]
_generator_set
=
True
if
opt_key
:
sys
.
argv
.
remove
(
arg
)
...
...
@@ -115,9 +117,9 @@ def _get_options():
if
custom_arg
:
sys
.
argv
.
remove
(
arg
)
return
_options
,
_cmake_config
,
_cmake_path
,
_cmake_extra
return
_options
,
_cmake_config
,
_cmake_path
,
_cmake_extra
,
_generator_set
options
,
cmake_config
,
cmake_path
,
cmake_extra
=
_get_options
()
options
,
cmake_config
,
cmake_path
,
cmake_extra
,
generator_set
=
_get_options
()
try
:
from
Queue
import
Queue
,
Empty
...
...
@@ -332,11 +334,6 @@ class build(_build):
if
sys
.
version_info
>=
(
3
,
0
):
cmake_extra_arch
+=
[
'-DPYTHON3=yes'
]
if
platform_arch
==
'64bit'
:
cmake_extra_arch
+=
[
'-DCMAKE_SIZEOF_VOID_P=8'
]
elif
platform_arch
==
'32bit'
:
cmake_extra_arch
+=
[
'-DCMAKE_SIZEOF_VOID_P=4'
]
if
platform_arch
==
'64bit'
and
sys
.
platform
==
"win32"
:
# help cmake to find Python library in 64bit Python in Windows
# because cmake is 32bit and cannot find PYTHON_LIBRARY from registry.
...
...
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