Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-18 06:30:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows fixes

Browse Source
This commit is contained in:
Wenzel Jakob 2015-10-13 23:58:10 +02:00
parent db028d685c
commit 607654f7ec
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -80,8 +80,16 @@ add_library(example SHARED
# Don't add a 'lib' prefix to the shared library # Don't add a 'lib' prefix to the shared library
set_target_properties(example PROPERTIES PREFIX "") set_target_properties(example PROPERTIES PREFIX "")
# Write the output file directly into the 'example' directory # Always write the output file directly into the 'example' directory (even on MSVC)
set_target_properties(example PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/example) set(CompilerFlags
LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_DIRECTORY_DEBUG
LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO
RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_RELEASE RUNTIME_OUTPUT_DIRECTORY_DEBUG
RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO)
foreach(CompilerFlag ${CompilerFlags})
set_target_properties(example PROPERTIES ${CompilerFlag} ${PROJECT_SOURCE_DIR}/example)
endforeach()
if (WIN32) if (WIN32)
if (MSVC) if (MSVC)

6
example/run_test.py
View File

@ -5,7 +5,7 @@ import subprocess
remove_unicode_marker = re.compile(r'u(\'[^\']*\')') remove_unicode_marker = re.compile(r'u(\'[^\']*\')')
remove_long_marker = re.compile(r'([0-9])L') remove_long_marker = re.compile(r'([0-9])L')
remove_hex = re.compile(r'0x[0-9a-f]+') remove_hex = re.compile(r'0x[0-9a-fA-F]+')
shorten_floats = re.compile(r'([1-9][0-9]*\.[0-9]{4})[0-9]*') shorten_floats = re.compile(r'([1-9][0-9]*\.[0-9]{4})[0-9]*')
@ -23,6 +23,10 @@ def sanitize(lines):
line = line.replace('example.', '') line = line.replace('example.', '')
line = line.replace('method of builtins.PyCapsule instance', '') line = line.replace('method of builtins.PyCapsule instance', '')
line = line.strip() line = line.strip()
if sys.platform == 'win32':
lower = line.lower()
if 'constructor' in lower or 'destructor' in lower or 'ref' in lower:
line = ""
lines[i] = line lines[i] = line
lines = '\n'.join(sorted([l for l in lines if l != ""])) lines = '\n'.join(sorted([l for l in lines if l != ""]))