SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@486 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-02-06 22:20:29 +00:00
parent e70b7baf0a
commit 17f45b050b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
qad/FindQAD.cmake
View File

@@ -7,6 +7,7 @@ endif()
if(NOT LIBPROJECT) if(NOT LIBPROJECT)
include(QtWraps) include(QtWraps)
endif() endif()
get_directory_property(hasParent PARENT_DIRECTORY)
set(_SEARCH_DIR) set(_SEARCH_DIR)
if(WIN32) if(WIN32)
find_package(MinGW REQUIRED) find_package(MinGW REQUIRED)
@@ -37,7 +38,9 @@ foreach(_Q ${_QAD_LIBS})
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
find_library(QAD${_v}_${_QU}_LIBRARY qad_${_Q}${_v} ${_SEARCH_DIR}) 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})
set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE) if(hasParent)
set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
endif()
endforeach() endforeach()
endif() endif()
#message(STATUS "Library ${_Q} (${_QU}) -> ${QAD_${_QU}_LIBRARY} found in ${_SEARCH_DIR}") #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_}) foreach(_v ${_QT_VERSIONS_})
find_library(QGLVIEW${_v}_LIBRARY qglview${_v} ${_SEARCH_DIR}) find_library(QGLVIEW${_v}_LIBRARY qglview${_v} ${_SEARCH_DIR})
set(MULTILIB_qglview_SUFFIX_Qt${_v} ${_v}) 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() 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 LIBPROJECT)
if (NOT _QAD_MSG) if (NOT _QAD_MSG)
set(_QAD_MSG 1 CACHE BOOL "msg_qad" FORCE) set(_QAD_MSG 1 CACHE BOOL "msg_qad" FORCE)

4
qglview/glprimitives.cpp
View File

@@ -45,7 +45,7 @@ GLPrimitiveCube::GLPrimitiveCube(double width, double length, double height, QVe
l = length; l = length;
h = height; h = height;
moveTo(pos); moveTo(pos);
init(); //init();
} }
@@ -114,7 +114,7 @@ GLPrimitiveEllipsoid::GLPrimitiveEllipsoid(double width, double length, double h
swl = seg_wl; swl = seg_wl;
sh = seg_h; sh = seg_h;
moveTo(pos); moveTo(pos);
init(); //init();
} }