From aaff3acdc2f6bcd8e8b996c10b40bbc4fc5cf85d Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Fri, 9 Feb 2018 17:33:15 +0100
Subject: [PATCH] Fix FindPythonQt.cmake
---
CMakeLists.txt | 2 +-
cmake-modules/FindPythonQt.cmake | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e3f7c..4109f47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ IF(NOT CLIENT_ONLY)
FINDPYTHON(2.7 EXACT)
FIND_PACKAGE(PythonQt COMPONENTS QtAll)
- SET(GEPETTO_GUI_HAS_PYTHONQT ${PYTHONQT_FOUND} CACHE BOOL "Use PythonQt dependency")
+ SET(GEPETTO_GUI_HAS_PYTHONQT (${PythonQt_FOUND} AND ${PythonQt_QtAll_FOUND}) CACHE BOOL "Use PythonQt dependency")
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
diff --git a/cmake-modules/FindPythonQt.cmake b/cmake-modules/FindPythonQt.cmake
index 7192bc1..703e354 100644
--- a/cmake-modules/FindPythonQt.cmake
+++ b/cmake-modules/FindPythonQt.cmake
@@ -26,10 +26,10 @@ MACRO(_SEARCH_FOR COMPONENT)
DOC "The ${COMPONENT} library.")
IF(NOT ${${_COMP_UPPERCASE}_LIBRARY} STREQUAL "${_COMP_UPPERCASE}_LIBRARY-NOTFOUND")
SET(${COMPONENT}_FOUND TRUE)
+ SET(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARIES} ${${_COMP_UPPERCASE}_LIBRARY})
ENDIF(NOT ${${_COMP_UPPERCASE}_LIBRARY} STREQUAL "${_COMP_UPPERCASE}_LIBRARY-NOTFOUND")
- MARK_AS_ADVANCED(${${_COMP_UPPERCASE}_LIBRARY})
- SET(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARIES} ${${_COMP_UPPERCASE}_LIBRARY})
+ MARK_AS_ADVANCED(${_COMP_UPPERCASE}_LIBRARY)
ENDMACRO(_SEARCH_FOR COMP)
_SEARCH_FOR(PythonQt)
--
GitLab