Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-29 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undid the accidental breaking of unit tests.

Browse Source 
I forgot that I commented out the find_package(PythonInterp) line.
In addition, python3.2 can't use the u'unicode string' syntax,
  and requires six.u('unicode string') instead.
This commit is contained in:
Eldritch Cheese 2015-12-30 16:04:10 -05:00
parent 3c9e389ebe
commit cc4b9eda0e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -23,9 +23,9 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
endif() endif()
string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE) string(TOUPPER "${CMAKE_BUILD_TYPE}" U_CMAKE_BUILD_TYPE)
set(Python_ADDITIONAL_VERSIONS 3.6 3.5 3.4 3.3 3.2) set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6)
find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} REQUIRED) find_package(PythonLibs ${PYBIND11_PYTHON_VERSION} REQUIRED)
#find_package(PythonInterp ${PYBIND11_PYTHON_VERSION} REQUIRED) find_package(PythonInterp ${PYBIND11_PYTHON_VERSION} REQUIRED)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)

5
example/example2.py
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function from __future__ import print_function
import six
import sys, pydoc import sys, pydoc
sys.path.append('.') sys.path.append('.')
@ -30,11 +31,11 @@ dict_result['key2'] = 'value2'
instance.print_dict_2(dict_result) instance.print_dict_2(dict_result)
set_result = instance.get_set() set_result = instance.get_set()
set_result.add(u'key3') set_result.add(six.u('key3'))
instance.print_set(set_result) instance.print_set(set_result)
set_result = instance.get_set2() set_result = instance.get_set2()
set_result.add(u'key3') set_result.add(six.u('key3'))
instance.print_set_2(set_result) instance.print_set_2(set_result)
list_result = instance.get_list() list_result = instance.get_list()