Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
6ea1421fd3
4 changed files with 23 additions and 5 deletions
10
.travis.yml
10
.travis.yml
|
@ -7,11 +7,17 @@ compiler:
|
|||
os:
|
||||
- linux
|
||||
env:
|
||||
- CMAKE_BUILD_OPTIONS="-DWITH_NEL_TESTS:BOOL=off"
|
||||
- CMAKE_BUILD_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=on -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=off"
|
||||
- CMAKE_BUILD_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=on -DWITH_LUA53:BOOL=off"
|
||||
- CMAKE_BUILD_OPTIONS="-DWITH_NEL_TESTS:BOOL=off -DWITH_LUA51:BOOL=off -DWITH_LUA52:BOOL=off -DWITH_LUA53:BOOL=on"
|
||||
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- liblua5.1-0-dev
|
||||
- liblua5.1-0-dbg
|
||||
- liblua5.2-0-dev
|
||||
- liblua5.2-0-dbg
|
||||
- libluabind-dev
|
||||
- libcpptest-dev
|
||||
- libogg-dev
|
||||
|
@ -32,7 +38,7 @@ script:
|
|||
notifications:
|
||||
irc:
|
||||
channels:
|
||||
- "chat.freenode.net#ryzom"
|
||||
- $NOTIFICATION_IRC_CHANNEL
|
||||
template:
|
||||
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
|
||||
- "Description : %{commit_message}"
|
||||
|
|
|
@ -73,7 +73,7 @@ endif()
|
|||
include(FindPackageHandleStandardArgs)
|
||||
# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
|
||||
# all listed variables are TRUE
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua53
|
||||
REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
|
||||
VERSION_VAR LUA_VERSION_STRING)
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue