Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Compilation with static Qt 5

Browse source
This commit is contained in:
kervala 2016-01-17 13:23:25 +01:00
parent d42d285958
commit 9ff0f99cea
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/tools/3d/panoply_preview/CMakeLists.txt
View file

@ -23,11 +23,17 @@ ADD_EXECUTABLE(nl_panoply_preview WIN32 ${SRC}
${PANOPLY_MAKER} ${PANOPLY_MAKER}
) )
IF(QT_STATIC)
SET(PANOPLY_PREVIEW_QT_LIBRARIES ${QT_LIBRARIES})
ELSE()
SET(PANOPLY_PREVIEW_QT_LIBRARIES Qt5::Widgets)
ENDIF()
TARGET_LINK_LIBRARIES(nl_panoply_preview TARGET_LINK_LIBRARIES(nl_panoply_preview
nelmisc nelmisc
nel3d nel3d
shared_widgets shared_widgets
Qt5::Widgets) ${PANOPLY_PREVIEW_QT_LIBRARIES})
NL_DEFAULT_PROPS(nl_panoply_preview "NeL, Tools, 3D: panoply_preview") NL_DEFAULT_PROPS(nl_panoply_preview "NeL, Tools, 3D: panoply_preview")
NL_ADD_RUNTIME_FLAGS(nl_panoply_preview) NL_ADD_RUNTIME_FLAGS(nl_panoply_preview)

8
code/nel/tools/3d/shared_widgets/CMakeLists.txt
View file

@ -13,7 +13,13 @@ QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES})
NL_TARGET_LIB(shared_widgets ${SRCS} ${HDRS} ${RSRC} ${RESOURCE_ADDED}) NL_TARGET_LIB(shared_widgets ${SRCS} ${HDRS} ${RSRC} ${RESOURCE_ADDED})
TARGET_LINK_LIBRARIES(shared_widgets nelmisc nel3d Qt5::Widgets) IF(QT_STATIC)
SET(SHARED_WIDGETS_QT_LIBRARIES ${QT_LIBRARIES})
ELSE()
SET(SHARED_WIDGETS_QT_LIBRARIES Qt5::Widgets)
ENDIF()
TARGET_LINK_LIBRARIES(shared_widgets nelmisc nel3d ${SHARED_WIDGETS_QT_LIBRARIES})
NL_DEFAULT_PROPS(shared_widgets "NeL, Tools, 3D: Shared Widgets") NL_DEFAULT_PROPS(shared_widgets "NeL, Tools, 3D: Shared Widgets")
NL_ADD_RUNTIME_FLAGS(shared_widgets) NL_ADD_RUNTIME_FLAGS(shared_widgets)