diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f223fc..2b0c671 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,12 +125,10 @@ if (SomeQtFound)
 	message(STATUS "Building Qt-derived targets for ${QtVersions}")
 	add_subdirectory(qad)
 	set(_DIRS piqt piqt_utils qcd_utils)
-	if (QGLVIEW)
-		if (Qt5)
-			#list(APPEND _DIRS qglview)
-			list(APPEND _DIRS qglengine)
+	if (Qt5)
+		if (QGLVIEW)
+			list(APPEND _DIRS qglview)
 		endif()
-	else()
 		if (QGLENGINE)
 			list(APPEND _DIRS qglengine)
 		endif()
diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index 60866ab..9f1fcae 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -78,7 +78,7 @@ macro(qad_install _TARGET _H_FILES _QM_FILES)
 				qt_install(TARGETS ${_TARGET} DESTINATION QtBin)
 				qt_install(FILES "${_QM_FILES}" DESTINATION QtLang)
 			else()
-				if(NOT _H_FILES STREQUAL "")
+				if(NOT "x${_H_FILES}" STREQUAL "x")
 					install(FILES ${_H_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad)
 				endif()
 				qt_install(TARGETS ${_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
@@ -86,7 +86,7 @@ macro(qad_install _TARGET _H_FILES _QM_FILES)
 		else()
 			qt_install(TARGETS ${_TARGET} DESTINATION bin)
 			qt_install(TARGETS ${_TARGET} DESTINATION lib)
-			if(NOT _H_FILES STREQUAL "")
+			if(NOT "x${_H_FILES}" STREQUAL "x")
 				install(FILES ${_H_FILES} DESTINATION include/qad)
 			endif()
 		endif()