From 2c5a5d0376893ab80c181aeb365c565c93429ad9 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 10 Jan 2016 12:12:50 +0100 Subject: [PATCH] Fixed: Compilation of object_viewer_widget in static under Linux --- .../tools/3d/object_viewer_widget/src/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt b/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt index 49fc99f40..2fc61f15f 100644 --- a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt +++ b/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt @@ -31,7 +31,13 @@ ENDIF() SOURCE_GROUP(QtGeneratedMocSrc FILES ${OBJECT_VIEWER_WIDGET_MOC_SRCS}) -ADD_LIBRARY(object_viewer_widget_qt MODULE +IF(WITH_STATIC) + SET(TYPE STATIC) +ELSE() + SET(TYPE MODULE) +ENDIF() + +ADD_LIBRARY(object_viewer_widget_qt ${TYPE} ${OBJECT_VIEWER_WIDGET_SRC} ${OBJECT_VIEWER_WIDGET_MOC_SRCS}) @@ -47,4 +53,4 @@ IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(object_viewer_widget_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) ENDIF() -#INSTALL(TARGETS object_viewer_widget_qt RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT runtime BUNDLE DESTINATION /Applications) +#INSTALL(TARGETS object_viewer_widget_qt RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT runtime)