From 607654f7ece64240ab56f47a48b13f64f56fe55f Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@inf.ethz.ch>
Date: Tue, 13 Oct 2015 23:58:10 +0200
Subject: [PATCH] windows fixes

---
 CMakeLists.txt      | 12 ++++++++++--
 example/run_test.py |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8f8a7bf..16c3dc6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,8 +80,16 @@ add_library(example SHARED
 # Don't add a 'lib' prefix to the shared library
 set_target_properties(example PROPERTIES PREFIX "")
 
-# Write the output file directly into the 'example' directory
-set_target_properties(example PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/example)
+# Always write the output file directly into the 'example' directory (even on MSVC)
+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 (MSVC)
diff --git a/example/run_test.py b/example/run_test.py
index d017031e..294d0311 100755
--- a/example/run_test.py
+++ b/example/run_test.py
@@ -5,7 +5,7 @@ import subprocess
 
 remove_unicode_marker = re.compile(r'u(\'[^\']*\')')
 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]*')
 
 
@@ -23,6 +23,10 @@ def sanitize(lines):
         line = line.replace('example.', '')
         line = line.replace('method of builtins.PyCapsule instance', '')
         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 = '\n'.join(sorted([l for l in lines if l != ""]))