From 19ab8294bb0b714dfce2999a9e6563cf1ed57645 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 17 Jan 2016 13:24:01 +0100
Subject: [PATCH] Merge with develop

---
 .travis.yml                                      | 10 ++++++++--
 code/CMakeModules/FindLua53.cmake                |  2 +-
 code/nel/tools/3d/panoply_preview/CMakeLists.txt |  8 +++++++-
 code/nel/tools/3d/shared_widgets/CMakeLists.txt  |  8 +++++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70030c877..ac0c28a1b 100644
--- a/.travis.yml
+++ b/.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}"
diff --git a/code/CMakeModules/FindLua53.cmake b/code/CMakeModules/FindLua53.cmake
index 45fdcf630..012f27c3f 100644
--- a/code/CMakeModules/FindLua53.cmake
+++ b/code/CMakeModules/FindLua53.cmake
@@ -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)
 
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)