Fix Windows module extensions and tests to work with --debug build

Use the same imp.get_suffixes() mechanism as on Unix, to determine
the suffix part of module extension files.

This fixes debug builds to work on Windows.

Note that the whole build stack has to use the same configuration,
no mixing is allowed on Windows.

For release build you need: python.exe + setup.py without --debug
flag + release build of Qt5.
For debug build you need: python_d.exe + setup.py with --debug
flag + debug build of Qt5.

Change-Id: I6188c859b5757d11e87d6a9e32b9ba558f7f609e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

6 files changed, 46 insertions, 55 deletions

diff --git a/sources/pyside2-examples b/sources/pyside2-examples
-Subproject c8c9f64eb4657c54f063f01f00116732cb3fc10
+Subproject 8df6dccecc5165f7c3ec5896c9be8baceda7161
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index 4ac5afa85..d89b0f890 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -43,38 +43,36 @@ macro(get_python_extension_suffix)
   message("PYTHON_EXTENSION_SUFFIX: " ${PYTHON_EXTENSION_SUFFIX})
 endmacro()
 
-# Note the quirk that UNIX includes Apple!
-if (UNIX)
-  if (NOT PYTHON_EXTENSION_SUFFIX)
-      get_python_extension_suffix()
-  endif()
 
-  if (NOT PYTHON_CONFIG_SUFFIX)
-      if (PYTHON_VERSION_MAJOR EQUAL 2)
-          set(PYTHON_CONFIG_SUFFIX "-python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-          if (PYTHON_EXTENSION_SUFFIX)
-              set(PYTHON_CONFIG_SUFFIX "${PYTHON_CONFIG_SUFFIX}${PYTHON_EXTENSION_SUFFIX}")
-          endif()
-      elseif (PYTHON_VERSION_MAJOR EQUAL 3)
-          set(PYTHON_CONFIG_SUFFIX "${PYTHON_EXTENSION_SUFFIX}")
+if (NOT PYTHON_EXTENSION_SUFFIX)
+  get_python_extension_suffix()
+endif()
+
+if (NOT PYTHON_CONFIG_SUFFIX)
+  if (PYTHON_VERSION_MAJOR EQUAL 2)
+      set(PYTHON_CONFIG_SUFFIX "-python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+      if (PYTHON_EXTENSION_SUFFIX)
+          set(PYTHON_CONFIG_SUFFIX "${PYTHON_CONFIG_SUFFIX}${PYTHON_EXTENSION_SUFFIX}")
       endif()
+  elseif (PYTHON_VERSION_MAJOR EQUAL 3)
+      set(PYTHON_CONFIG_SUFFIX "${PYTHON_EXTENSION_SUFFIX}")
   endif()
+endif()
 
-  if (NOT PYTHON_SHARED_LIBRARY_SUFFIX)
-      set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_CONFIG_SUFFIX}")
+if (NOT PYTHON_SHARED_LIBRARY_SUFFIX)
+  set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_CONFIG_SUFFIX}")
 
-      # Append a "v" to disambiguate the python version and the pyside version in the
-      # shared library file name.
-      if (APPLE AND PYTHON_VERSION_MAJOR EQUAL 2)
-          set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_SHARED_LIBRARY_SUFFIX}v")
-      endif()
+  # Append a "v" to disambiguate the python version and the pyside version in the
+  # shared library file name.
+  if (APPLE AND PYTHON_VERSION_MAJOR EQUAL 2)
+      set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_SHARED_LIBRARY_SUFFIX}v")
   endif()
+endif()
 
 
-  message(STATUS "PYTHON_EXTENSION_SUFFIX:      ${PYTHON_EXTENSION_SUFFIX}")
-  message(STATUS "PYTHON_CONFIG_SUFFIX:         ${PYTHON_CONFIG_SUFFIX}")
-  message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}")
-endif()
+message(STATUS "PYTHON_EXTENSION_SUFFIX:      ${PYTHON_EXTENSION_SUFFIX}")
+message(STATUS "PYTHON_CONFIG_SUFFIX:         ${PYTHON_CONFIG_SUFFIX}")
+message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}")
 
 find_package(Shiboken2 2.0.0 REQUIRED)
 find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core)
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake
index daa5401a1..468ce51bc 100644
--- a/sources/pyside2/cmake/Macros/PySideModules.cmake
+++ b/sources/pyside2/cmake/Macros/PySideModules.cmake
@@ -100,9 +100,6 @@ macro(create_pyside_module
                           LIBRARY_OUTPUT_DIRECTORY ${pyside2_BINARY_DIR})
     if(WIN32)
         set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")
-        set(${module_name}_suffix ".pyd")
-    else()
-        set(${module_name}_suffix ${CMAKE_SHARED_MODULE_SUFFIX})
     endif()
 
     target_link_libraries(${module_name} ${${module_libraries}})
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt
index 0702d6085..b5fcb8d12 100644
--- a/sources/pyside2/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt
@@ -90,7 +90,7 @@ add_library(testbinding MODULE ${testbinding_SRC})
 set_property(TARGET testbinding PROPERTY PREFIX "")
 set_property(TARGET testbinding PROPERTY OUTPUT_NAME "testbinding${PYTHON_EXTENSION_SUFFIX}")
 if(WIN32)
-    set_target_properties(testbinding PROPERTIES SUFFIX ".pyd")
+    set_property(TARGET testbinding PROPERTY SUFFIX ".pyd")
 endif()
 target_link_libraries(testbinding
                       pysidetest
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt
index 549974b8c..424142699 100644
--- a/sources/shiboken2/CMakeLists.txt
+++ b/sources/shiboken2/CMakeLists.txt
@@ -58,38 +58,37 @@ macro(get_python_extension_suffix)
   message("PYTHON_EXTENSION_SUFFIX: " ${PYTHON_EXTENSION_SUFFIX})
 endmacro()
 
-# Note the quirk that UNIX includes Apple!
-if (UNIX)
-  if (NOT PYTHON_EXTENSION_SUFFIX)
-      get_python_extension_suffix()
-  endif()
 
-  if (NOT PYTHON_CONFIG_SUFFIX)
-      if (PYTHON_VERSION_MAJOR EQUAL 2)
-          set(PYTHON_CONFIG_SUFFIX "-python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
-          if (PYTHON_EXTENSION_SUFFIX)
-              set(PYTHON_CONFIG_SUFFIX "${PYTHON_CONFIG_SUFFIX}${PYTHON_EXTENSION_SUFFIX}")
-          endif()
-      elseif (PYTHON_VERSION_MAJOR EQUAL 3)
-          set(PYTHON_CONFIG_SUFFIX "${PYTHON_EXTENSION_SUFFIX}")
+if (NOT PYTHON_EXTENSION_SUFFIX)
+  get_python_extension_suffix()
+endif()
+
+if (NOT PYTHON_CONFIG_SUFFIX)
+  if (PYTHON_VERSION_MAJOR EQUAL 2)
+      set(PYTHON_CONFIG_SUFFIX "-python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
+      if (PYTHON_EXTENSION_SUFFIX)
+          set(PYTHON_CONFIG_SUFFIX "${PYTHON_CONFIG_SUFFIX}${PYTHON_EXTENSION_SUFFIX}")
       endif()
+  elseif (PYTHON_VERSION_MAJOR EQUAL 3)
+      set(PYTHON_CONFIG_SUFFIX "${PYTHON_EXTENSION_SUFFIX}")
   endif()
+endif()
 
-  if (NOT PYTHON_SHARED_LIBRARY_SUFFIX)
-      set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_CONFIG_SUFFIX}")
+if (NOT PYTHON_SHARED_LIBRARY_SUFFIX)
+  set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_CONFIG_SUFFIX}")
 
-      # Append a "v" to disambiguate the python version and the shiboken version in the
-      # shared library file name.
-      if (APPLE AND PYTHON_VERSION_MAJOR EQUAL 2)
-          set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_SHARED_LIBRARY_SUFFIX}v")
-      endif()
+  # Append a "v" to disambiguate the python version and the shiboken version in the
+  # shared library file name.
+  if (APPLE AND PYTHON_VERSION_MAJOR EQUAL 2)
+      set(PYTHON_SHARED_LIBRARY_SUFFIX "${PYTHON_SHARED_LIBRARY_SUFFIX}v")
   endif()
+endif()
 
 
-  message(STATUS "PYTHON_EXTENSION_SUFFIX:      ${PYTHON_EXTENSION_SUFFIX}")
-  message(STATUS "PYTHON_CONFIG_SUFFIX:         ${PYTHON_CONFIG_SUFFIX}")
-  message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}")
-endif()
+message(STATUS "PYTHON_EXTENSION_SUFFIX:      ${PYTHON_EXTENSION_SUFFIX}")
+message(STATUS "PYTHON_CONFIG_SUFFIX:         ${PYTHON_CONFIG_SUFFIX}")
+message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}")
+
 
 if (NOT PYTHON_SITE_PACKAGES)
     execute_process(
diff --git a/sources/shiboken2/shibokenmodule/CMakeLists.txt b/sources/shiboken2/shibokenmodule/CMakeLists.txt
index 5e8e39d5f..31b98132d 100644
--- a/sources/shiboken2/shibokenmodule/CMakeLists.txt
+++ b/sources/shiboken2/shibokenmodule/CMakeLists.txt
@@ -27,9 +27,6 @@ set_property(TARGET shibokenmodule PROPERTY PREFIX "")
 set_property(TARGET shibokenmodule PROPERTY OUTPUT_NAME "shiboken2${PYTHON_EXTENSION_SUFFIX}")
 
 if(WIN32)
-    if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-        set_property(TARGET shibokenmodule PROPERTY OUTPUT_NAME "shiboken2_d")
-    endif()
     set_property(TARGET shibokenmodule PROPERTY SUFFIX ".pyd")
 endif()
 target_link_libraries(shibokenmodule