From 58d23bbe97b983da00c730669fd33eb7586b07a9 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 17 Jan 2016 13:23:25 +0100 Subject: [PATCH] Fixed: Compilation with static Qt 5 --HG-- branch : develop --- code/nel/tools/3d/panoply_preview/CMakeLists.txt | 8 +++++++- code/nel/tools/3d/shared_widgets/CMakeLists.txt | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/nel/tools/3d/panoply_preview/CMakeLists.txt b/code/nel/tools/3d/panoply_preview/CMakeLists.txt index 4f96eeea3..3c7e17050 100644 --- a/code/nel/tools/3d/panoply_preview/CMakeLists.txt +++ b/code/nel/tools/3d/panoply_preview/CMakeLists.txt @@ -23,11 +23,17 @@ ADD_EXECUTABLE(nl_panoply_preview WIN32 ${SRC} ${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 nelmisc nel3d shared_widgets - Qt5::Widgets) + ${PANOPLY_PREVIEW_QT_LIBRARIES}) NL_DEFAULT_PROPS(nl_panoply_preview "NeL, Tools, 3D: panoply_preview") NL_ADD_RUNTIME_FLAGS(nl_panoply_preview) diff --git a/code/nel/tools/3d/shared_widgets/CMakeLists.txt b/code/nel/tools/3d/shared_widgets/CMakeLists.txt index 4208988ec..2ac70dfe6 100644 --- a/code/nel/tools/3d/shared_widgets/CMakeLists.txt +++ b/code/nel/tools/3d/shared_widgets/CMakeLists.txt @@ -13,7 +13,13 @@ QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES}) 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_ADD_RUNTIME_FLAGS(shared_widgets)