Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
63983cd5ac
2 changed files with 14 additions and 3 deletions
|
@ -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}"
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue