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(); }