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

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

Browse Source
This commit is contained in:
Бычков Андрей
2020-03-05 08:02:25 +00:00
parent ec968e9ad7
commit 46661746a7
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -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()

4
qad/CMakeLists.txt
View File

@@ -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()