Fixed: Compilation with static Qt 5
--HG-- branch : develop
This commit is contained in:
parent
d5749430f7
commit
58d23bbe97
2 changed files with 14 additions and 2 deletions
code/nel/tools/3d
|
@ -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)
|
||||||
|
|
|
@ -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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue