Merge with develop

--HG--
branch : compatibility-develop

code/CMakeModules/FindHelpers.cmake

@@ -38,6 +38,21 @@ MACRO(PARSE_VERSION_OTHER FILENAME)
   ENDIF()
 ENDMACRO()
 
+# macro to define FIND_PACKAGE options with a different package name
+MACRO(FIX_PACKAGE_OPTIONS OLDNAME NEWNAME)
+  # append other options if needed
+  SET(_OPTIONS COMPONENTS REQUIRED QUIETLY)
+
+  # process each options
+  FOREACH(_OPTION ${_OPTIONS})
+    SET(OLD_OPTION ${OLDNAME}_FIND_${_OPTION})
+    IF(DEFINED )
+      SET(NEW_OPTION ${NEWNAME}_FIND_${_OPTION})
+      SET(${NEW_OPTION} ${OLD_OPTION})
+    ENDIF()
+  ENDFOREACH()
+ENDMACRO()
+
 MACRO(FIND_PACKAGE_HELPER NAME INCLUDE)
   # Looks for a directory containing NAME.
   #
@@ -692,11 +707,11 @@ MACRO(ADD_QT_LIBRARY _NAME)
   ENDIF()
   SET(_LIB "${QT_LIBRARY_DIR}/${_PREFIX}${_NAME}.${_EXT}")
   IF(EXISTS ${_LIB})
-    SET(QT_LIBRARIES ${QT_LIBRARIES} optimized ${_LIB})
+    LIST(APPEND QT_LIBRARIES optimized ${_LIB})
   ENDIF()
   SET(_LIB "${QT_LIBRARY_DIR}/${_PREFIX}${_NAME}d.${_EXT}")
   IF(EXISTS ${_LIB})
-    SET(QT_LIBRARIES ${QT_LIBRARIES} debug ${_LIB})
+    LIST(APPEND QT_LIBRARIES debug ${_LIB})
   ENDIF()
 ENDMACRO()
 
@@ -710,11 +725,11 @@ MACRO(ADD_QT_PLUGIN _TYPE _NAME)
   ENDIF()
   SET(_LIB "${QT_PLUGINS_DIR}/${_TYPE}/${_PREFIX}${_NAME}.${_EXT}")
   IF(EXISTS ${_LIB})
-    SET(QT_LIBRARIES ${QT_LIBRARIES} optimized ${_LIB})
+    LIST(APPEND QT_LIBRARIES optimized ${_LIB})
   ENDIF()
   SET(_LIB "${QT_PLUGINS_DIR}/${_TYPE}/${_PREFIX}${_NAME}d.${_EXT}")
   IF(EXISTS ${_LIB})
-    SET(QT_LIBRARIES ${QT_LIBRARIES} debug ${_LIB})
+    LIST(APPEND QT_LIBRARIES debug ${_LIB})
   ENDIF()
 ENDMACRO()
 
@@ -789,12 +804,12 @@ MACRO(FIND_QT5)
       SET(QT_LIBRARIES Qt5::Widgets)
 
       # Gui
-      SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Gui Qt5::OpenGL)
+      LIST(APPEND QT_LIBRARIES Qt5::Gui Qt5::OpenGL)
 
       ADD_QT_LIBRARY(PrintSupport)
 
       IF(WIN32)
-        SET(QT_LIBRARIES ${QT_LIBRARIES}
+        LIST(APPEND QT_LIBRARIES
           ${WINSDK_LIBRARY_DIR}/Imm32.lib
           ${WINSDK_LIBRARY_DIR}/OpenGL32.lib
           ${WINSDK_LIBRARY_DIR}/WinMM.Lib)
@@ -812,7 +827,7 @@ MACRO(FIND_QT5)
         FIND_LIBRARY(SYSTEMCONFIGURATION_FRAMEWORK SystemConfiguration)
         FIND_LIBRARY(OPENGL_FRAMEWORK NAMES OpenGL)
 
-        SET(QT_LIBRARIES ${QT_LIBRARIES}
+        LIST(APPEND QT_LIBRARIES
           ${CUPS_LIBRARY}
           ${COCOA_FRAMEWORK}
           ${SYSTEMCONFIGURATION_FRAMEWORK}
@@ -839,7 +854,7 @@ MACRO(FIND_QT5)
         ADD_QT_LIBRARY(DBus)
 
         IF(EXISTS "${QT_LIBRARY_DIR}/libxcb-static.a")
-          SET(QT_LIBRARIES ${QT_LIBRARIES} "${QT_LIBRARY_DIR}/libxcb-static.a")
+          LIST(APPEND QT_LIBRARIES "${QT_LIBRARY_DIR}/libxcb-static.a")
         ENDIF()
 
         # always link these in dynamic, API never changes
@@ -871,14 +886,14 @@ MACRO(FIND_QT5)
         SET(HB_LIB "${QT_LIBRARY_DIR}/qtharfbuzzng.lib")
       ENDIF()
       IF(EXISTS ${HB_LIB})
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${HB_LIB})
+        LIST(APPEND QT_LIBRARIES ${HB_LIB})
       ENDIF()
 
       # freetype is needed since Qt 5.5
       FIND_PACKAGE(Freetype)
 
       IF(FREETYPE_FOUND)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIBRARIES})
+        LIST(APPEND QT_LIBRARIES ${FREETYPE_LIBRARIES})
       ELSE()
         IF(UNIX)
           SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/libqtfreetype.a")
@@ -886,27 +901,27 @@ MACRO(FIND_QT5)
           SET(FREETYPE_LIB "${QT_LIBRARY_DIR}/qtfreetype.lib")
         ENDIF()
         IF(EXISTS ${FREETYPE_LIB})
-          SET(QT_LIBRARIES ${QT_LIBRARIES} ${FREETYPE_LIB})
+          LIST(APPEND QT_LIBRARIES ${FREETYPE_LIB})
         ENDIF()
       ENDIF()
 
       ADD_QT_PLUGIN(accessible qtaccessiblewidgets)
 
-      SET(QT_LIBRARIES ${QT_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARY})
+      LIST(APPEND QT_LIBRARIES ${PNG_LIBRARIES} ${JPEG_LIBRARY})
 
       # Network
-      SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Network Qt5::Xml)
+      LIST(APPEND QT_LIBRARIES Qt5::Network Qt5::Xml)
-      SET(QT_LIBRARIES ${QT_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
+      LIST(APPEND QT_LIBRARIES ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
 
       IF(WIN32)
-        SET(QT_LIBRARIES ${QT_LIBRARIES}
+        LIST(APPEND QT_LIBRARIES
           ${WINSDK_LIBRARY_DIR}/Crypt32.lib
           ${WINSDK_LIBRARY_DIR}/WS2_32.Lib
           ${WINSDK_LIBRARY_DIR}/IPHlpApi.Lib)
       ENDIF()
 
       # Core
-      SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Core)
+      LIST(APPEND QT_LIBRARIES Qt5::Core)
 
       # pcre is needed since Qt 5.5
       IF(UNIX)
@@ -918,7 +933,7 @@ MACRO(FIND_QT5)
         SET(PCRE_LIB "${QT_LIBRARY_DIR}/qtpcre.lib")
       ENDIF()
       IF(EXISTS ${PCRE_LIB})
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${PCRE_LIB})
+        LIST(APPEND QT_LIBRARIES ${PCRE_LIB})
       ENDIF()
 
       IF(APPLE)
@@ -926,13 +941,14 @@ MACRO(FIND_QT5)
 
         FIND_LIBRARY(SECURITY_FRAMEWORK Security)
 
-        SET(QT_LIBRARIES ${QT_LIBRARIES}
+        LIST(APPEND QT_LIBRARIES
           ${PCRE_LIBRARY}
           ${FOUNDATION_FRAMEWORK}
           ${CARBON_FRAMEWORK}
           ${SECURITY_FRAMEWORK})
       ELSEIF(UNIX)
-        SET(QT_LIBRARIES ${QT_LIBRARIES} ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} -ldl -lrt)
+        FIND_PACKAGE(Threads)
+        LIST(APPEND QT_LIBRARIES ${ZLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} -lrt)
       ENDIF()
     ELSE()
       SET(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::Xml Qt5::Gui Qt5::OpenGL Qt5::Core)

code/CMakeModules/FindRyzomGameShare.cmake

@@ -3,6 +3,10 @@ INCLUDE(FindHelpers)
 FIND_PACKAGE_HELPER(RyzomGameShare game_share/continent.h RELEASE ryzom_gameshare_r ryzom_gameshare DEBUG ryzom_gameshare_d DIR ${NEL_DIR} ${RYZOM_DIR} SUFFIXES ryzom)
 
 IF(RYZOMGAMESHARE_FOUND)
+  FIND_PACKAGE(NeL REQUIRED)
+  LIST(APPEND RYZOMGAMESHARE_INCLUDE_DIRS ${NEL_INCLUDE_DIRS})
+  LIST(APPEND RYZOMGAMESHARE_LIBRARIES ${NELMISC_LIBRARIES} ${NELLIGO_LIBRARIES} ${NELNET_LIBRARIES} ${NELGEORGES_LIBRARIES})
+
   SET(RYZOM_GAMESHARE_LIBRARIES ${RYZOMGAMESHARE_LIBRARIES})
   SET(RYZOM_GAMESHARE_FOUND ${RYZOMGAMESHARE_FOUND})
   SET(RYZOM_GAMESHARE_INCLUDE_DIR ${RYZOMGAMESHARE_INCLUDE_DIR})

code/nel/include/nel/net/module_gateway.h

@@ -171,8 +171,7 @@ namespace NLNET
 		virtual void	setTransportPeerInvisible(const std::string &transportInstanceName, bool peerInvisible) =0;
 
 		/// Activate/stop firewalling mode on a transport
-		virtual void	setTransportFirewallMode(const std::string &transportInstanceName, bool firewalled)
+		virtual void	setTransportFirewallMode(const std::string &transportInstanceName, bool firewalled) =0;
-			throw (EGatewayFirewallBreak) =0;
 
 		/// Send a command to a transport
 		virtual void	transportCommand(const TParsedCommandLine &commandLine) =0;
@@ -233,9 +232,7 @@ namespace NLNET
 		/** Disclose module information to a connected gateway.
 		 *	This can also be this gateway itself.
 		 */
-		virtual void discloseModule(IModuleProxy *moduleProxy)
+		virtual void discloseModule(IModuleProxy *moduleProxy) =0;
-			throw (EGatewayNotConnected)
-			=0;
 
 		/** Retrieve the proxy for a locally plugged module.
 		 *	Each local module plugged in a gateway has an associated

code/nel/src/net/module_gateway.cpp

@@ -448,7 +448,6 @@ namespace NLNET
 
 		/// Activate/stop firewalling mode on a transport
 		virtual void	setTransportFirewallMode(const std::string &transportInstanceName, bool firewalled)
-			throw (EGatewayFirewallBreak)
 		{
 			TTransportList::iterator it(_Transports.find(transportInstanceName));
 			if (it == _Transports.end())
@@ -1246,7 +1245,6 @@ namespace NLNET
 		}
 
 		virtual void discloseModule(IModuleProxy *moduleProxy)
-			throw (EGatewayNotConnected)
 		{
 			nlassert(moduleProxy->getModuleGateway() == this);
 
@@ -1584,7 +1582,6 @@ namespace NLNET
 		}
 
 		virtual void _broadcastModuleMessage(IModule *senderModule, const NLNET::CMessage &message)
-			throw (EModuleNotPluggedHere)
 		{
 			H_AUTO(CModuleGetaway__broadcastModuleMessage);
 			// send the message to all proxies (except the sender module)

code/nel/src/net/module_local_gateway.cpp

@@ -102,7 +102,6 @@ namespace NLNET
 
 		/// Activate/stop firewalling mode on a transport
 		virtual void	setTransportFirewallMode(const std::string &/* transportInstanceName */, bool /* firewalled */)
-			throw (EGatewayFirewallBreak)
 		{
 			// unsupported
 			nlstop;
@@ -174,12 +173,10 @@ namespace NLNET
 //			return;
 //		}
 //		virtual void openGatewayServer(uint16 listeningPort)
-//			throw (EGatewayAlreadyOpen, EGatewayPortInUse)
 //		{
 //			nlstop;
 //		}
 //		virtual void closeGatewayServer()
-//			throw (EGatewayNotOpen)
 //		{
 //			nlstop;
 //		}
@@ -233,7 +230,6 @@ namespace NLNET
 		{
 		}
 		virtual void discloseModule(IModuleProxy *moduleProxy)
-			throw (EGatewayNotConnected)
 		{
 			// check that the module is plugged here
 			nlassert(_ModuleProxies.getB(moduleProxy) != NULL);

code/studio/src/plugins/object_viewer/particle_system/particle_node.cpp

@@ -340,7 +340,7 @@ std::string CParticleWorkspace::getFilename() const
 	return CFile::getFilename(_Filename);
 }
 
-CWorkspaceNode *CParticleWorkspace::addNode(const std::string &filenameWithFullPath)  throw( NLMISC::Exception)
+CWorkspaceNode *CParticleWorkspace::addNode(const std::string &filenameWithFullPath)
 {
 	// Check that file is not already inserted
 	std::string fileName = NLMISC::CFile::getFilename(filenameWithFullPath);