diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e3f7c78406effa5c1a04509af2b8da16efa4ae..4109f4788df25ac0e3ffab2fdd5067fd4d784117 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 7192bc1456918bed959952add8ccf363436182f4..703e35469d79dcec5ad32f8a53c683f61b7382ce 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)