From 17f45b050b4fce7cf15fc73c9e2c0351e0144cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 6 Feb 2019 22:20:29 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@486
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 qad/FindQAD.cmake        | 13 ++++++++++---
 qglview/glprimitives.cpp |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/qad/FindQAD.cmake b/qad/FindQAD.cmake
index 177c353..24317ea 100644
--- a/qad/FindQAD.cmake
+++ b/qad/FindQAD.cmake
@@ -7,6 +7,7 @@ endif()
 if(NOT LIBPROJECT)
 	include(QtWraps)
 endif()
+get_directory_property(hasParent PARENT_DIRECTORY)
 set(_SEARCH_DIR)
 if(WIN32)
 	find_package(MinGW REQUIRED)
@@ -37,7 +38,9 @@ foreach(_Q ${_QAD_LIBS})
 		foreach(_v ${_QT_VERSIONS_})
 			find_library(QAD${_v}_${_QU}_LIBRARY qad_${_Q}${_v} ${_SEARCH_DIR})
 			set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v})
-			set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
+			if(hasParent)
+				set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
+			endif()
 		endforeach()
 	endif()
 	#message(STATUS "Library ${_Q} (${_QU}) -> ${QAD_${_QU}_LIBRARY} found in ${_SEARCH_DIR}")
@@ -47,9 +50,13 @@ list(APPEND QT_MULTILIB_LIST qglview)
 foreach(_v ${_QT_VERSIONS_})
 	find_library(QGLVIEW${_v}_LIBRARY qglview${_v} ${_SEARCH_DIR})
 	set(MULTILIB_qglview_SUFFIX_Qt${_v} ${_v})
-	set(MULTILIB_qglview_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
+	if(hasParent)
+		set(MULTILIB_qglview_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
+	endif()
 endforeach()
-set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
+if(hasParent)
+	set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
+endif()
 if(NOT LIBPROJECT)
 	if (NOT _QAD_MSG)
 		set(_QAD_MSG 1 CACHE BOOL "msg_qad" FORCE)
diff --git a/qglview/glprimitives.cpp b/qglview/glprimitives.cpp
index 3bdcac8..d934b25 100644
--- a/qglview/glprimitives.cpp
+++ b/qglview/glprimitives.cpp
@@ -45,7 +45,7 @@ GLPrimitiveCube::GLPrimitiveCube(double width, double length, double height, QVe
 	l = length;
 	h = height;
 	moveTo(pos);
-	init();
+	//init();
 }
 
 
@@ -114,7 +114,7 @@ GLPrimitiveEllipsoid::GLPrimitiveEllipsoid(double width, double length, double h
 	swl = seg_wl;
 	sh = seg_h;
 	moveTo(pos);
-	init();
+	//init();
 }