OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

merged

This commit is contained in:
Davis King 2016-12-27 08:25:13 -05:00
parent b93b6f36a4 c22bedc1c6
commit d0726637f5
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlib/test/string.cpp
View File

@ -243,6 +243,13 @@ namespace
DLIB_TEST(wv[0] == L"test");
DLIB_TEST(wv[1] == L"string");
wstr = L"Über alle Maßen\u00A0Öttingenstraße";
wv = split(wstr, L" \u00A0\n\r\t");
DLIB_TEST(wv.size() == 4);
DLIB_TEST(wv[0] == L"Über");
DLIB_TEST(wv[1] == L"alle");
DLIB_TEST(wv[2] == L"Maßen");
DLIB_TEST(wv[3] == L"Öttingenstraße");
wstr = L"test string hah";
DLIB_TEST(split_on_first(wstr).first == L"test");

10
setup.py
View File

@ -355,7 +355,7 @@ def read_version():
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]
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):
@ -504,6 +504,14 @@ class build(_build):
# make sure build artifacts are generated for the version of Python currently running
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):
cmake_extra_arch += ['-DPYTHON3=yes']