From 742fa9a75b65655bde1e0ad1fa57b4989f88b609 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Sun, 18 Jun 2017 21:53:08 +0200
Subject: [PATCH] [CMakeModules] fix routine

---
 CMakeModules/FindPythonQt.cmake | 42 +++++----------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/CMakeModules/FindPythonQt.cmake b/CMakeModules/FindPythonQt.cmake
index 52f36db82..d016b57b1 100644
--- a/CMakeModules/FindPythonQt.cmake
+++ b/CMakeModules/FindPythonQt.cmake
@@ -29,10 +29,10 @@ find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll PATHS "${PYTHONQT_INS
 find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
 
 # Also check for v3.2+
-find_library(PYTHONQT_LIBRARY_V32_RELEASE PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
-find_library(PYTHONQT_LIBRARY_V32_DEBUG NAMES PythonQt-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
-find_library(PYTHONQT_QTALL_LIBRARY_V32_RELEASE PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
-find_library(PYTHONQT_QTALL_LIBRARY_V32_DEBUG NAMES PythonQt_QtAll-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
+find_library(PYTHONQT_LIBRARY_RELEASE PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
+find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
+find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
 
 set(PYTHONQT_LIBRARY)
 if(PYTHONQT_LIBRARY_RELEASE)
@@ -42,14 +42,6 @@ if(PYTHONQT_LIBRARY_DEBUG)
   list(APPEND PYTHONQT_LIBRARY debug ${PYTHONQT_LIBRARY_DEBUG})
 endif()
 
-set(PYTHONQT_LIBRARY_V32)
-if(PYTHONQT_LIBRARY_V32_RELEASE)
-  list(APPEND PYTHONQT_LIBRARY_V32 optimized ${PYTHONQT_LIBRARY_V32_RELEASE})
-endif()
-if(PYTHONQT_LIBRARY_V32_DEBUG)
-  list(APPEND PYTHONQT_LIBRARY_V32 debug ${PYTHONQT_LIBRARY_V32_DEBUG})
-endif()
-
 set(PYTHONQT_QTALL_LIBRARY)
 if(PYTHONQT_QTALL_LIBRARY_RELEASE)
   list(APPEND PYTHONQT_QTALL_LIBRARY optimized ${PYTHONQT_QTALL_LIBRARY_RELEASE})
@@ -58,24 +50,12 @@ if(PYTHONQT_QTALL_LIBRARY_DEBUG)
   list(APPEND PYTHONQT_QTALL_LIBRARY debug ${PYTHONQT_QTALL_LIBRARY_DEBUG})
 endif()
 
-set(PYTHONQT_QTALL_LIBRARY_V32)
-if(PYTHONQT_QTALL_LIBRARY_RELEASE)
-  list(APPEND PYTHONQT_QTALL_LIBRARY_V32 optimized ${PYTHONQT_QTALL_LIBRARY_V32_RELEASE})
-endif()
-if(PYTHONQT_QTALL_LIBRARY_V32_DEBUG)
-  list(APPEND PYTHONQT_QTALL_LIBRARY_V32 debug ${PYTHONQT_QTALL_LIBRARY_V32_DEBUG})
-endif()
-
 mark_as_advanced(PYTHONQT_INSTALL_DIR)
 mark_as_advanced(PYTHONQT_INCLUDE_DIR)
 mark_as_advanced(PYTHONQT_LIBRARY_RELEASE)
 mark_as_advanced(PYTHONQT_LIBRARY_DEBUG)
 mark_as_advanced(PYTHONQT_QTALL_LIBRARY_RELEASE)
 mark_as_advanced(PYTHONQT_QTALL_LIBRARY_DEBUG)
-mark_as_advanced(PYTHONQT_LIBRARY_V32_RELEASE)
-mark_as_advanced(PYTHONQT_LIBRARY_V32_DEBUG)
-mark_as_advanced(PYTHONQT_QTALL_LIBRARY_V32_RELEASE)
-mark_as_advanced(PYTHONQT_QTALL_LIBRARY_V32_DEBUG)
 
 # On linux, also find libutil
 if(UNIX AND NOT APPLE)
@@ -87,21 +67,11 @@ endif()
 set(PYTHONQT_FOUND 0)
 set(PythonQt_FOUND 0)
 
-if(PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY)
-  set(PYTHONQT_LIB)
-elseif(PYTHONQT_LIBRARY_V32 AND PYTHONQT_QTALL_LIBRARY_V32)
-  set(PYTHONQT_LIB_V32)
-endif()
-
-if((PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIB) OR (PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIB_V32))
+if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIBRARY AND PYTHONQT_QTALL_LIBRARY)
   # Currently CMake'ified PythonQt only supports building against a python Release build.
   # This applies independently of CTK build type (Release, Debug, ...)
   add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
   set(PYTHONQT_FOUND 1)
   set(PythonQt_FOUND ${PYTHONQT_FOUND})
-  if(PYTHONQT_LIB)
-    set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY})
-  elseif(PYTHONQT_LIB_V32)
-    set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY_V32} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY_V32})
-  endif()
+  set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL} ${PYTHONQT_QTALL_LIBRARY})
 endif()