From a8e28a20b472a6278007da1a64525578647b6d14 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 10 Jan 2016 12:13:59 +0100 Subject: [PATCH] Merge with develop --- .travis.yml | 7 ++++++- .../tools/3d/object_viewer_widget/src/CMakeLists.txt | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e9a39af6..f475c1eaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,4 +30,9 @@ script: - cmake --build build -- -j 2 notifications: - irc: "chat.freenode.net#ryzomforge" + irc: "chat.freenode.net#ryzomforge" + template: + - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}" + - "Description : %{commit_message}" + - "Change view : %{compare_url}" + - "Build details : %{build_url}" 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)