changed #20 - moved the libwww package discovery and fixed include paths in library project.

code/CMakeLists.txt

@@ -135,6 +135,10 @@ IF(WITH_NEL)
     FIND_PACKAGE(CppTest)
   ENDIF(WITH_NEL_TESTS)
 
+  IF(WITH_GUI)
+    FIND_PACKAGE(Libwww REQUIRED)
+  ENDIF(WITH_GUI)
+
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
   ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
   ADD_SUBDIRECTORY(nel)

code/nel/include/nel/gui/group_html.h

@@ -31,7 +31,7 @@ typedef std::map<std::string, std::string>	TStyle;
 
 extern "C"
 {
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 namespace NLGUI

code/nel/include/nel/gui/libwww.h

@@ -22,7 +22,7 @@
 
 extern "C"
 {
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 namespace NLGUI

code/nel/include/nel/gui/libwww_nel_stream.h

@@ -20,7 +20,7 @@
 #define LIBWWW_NEL_STREAM_H
 
 
-#include "libwww/HTProt.h"
+#include "HTProt.h"
 
 extern "C" HTProtCallback HTLoadNeLFile;
 extern "C" PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * param, int mode);

code/nel/src/gui/CMakeLists.txt

@@ -12,7 +12,7 @@ SET_TARGET_PROPERTIES(nelgui PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
 NL_ADD_RUNTIME_FLAGS(nelgui)
 
-INCLUDE_DIRECTORIES( ${LUA_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( ${LUA_INCLUDE_DIR} ${LIBWWW_INCLUDE_DIR})
 
 NL_ADD_LIB_SUFFIX(nelgui)
 

code/nel/src/gui/group_html.cpp

@@ -23,9 +23,9 @@
 // LibWWW
 extern "C"
 {
-#include "libwww/WWWLib.h"			      /* Global Library Include file */
+#include "WWWLib.h"			      /* Global Library Include file */
-#include "libwww/WWWApp.h"
+#include "WWWApp.h"
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 #include <string>

code/nel/src/gui/libwww.cpp

@@ -21,9 +21,9 @@
 // LibWWW
 extern "C"
 {
-#include "libwww/WWWLib.h"			      /* Global Library Include file */
+#include "WWWLib.h"			      /* Global Library Include file */
-#include "libwww/WWWApp.h"
+#include "WWWApp.h"
-#include "libwww/WWWInit.h"
+#include "WWWInit.h"
 }
 
 #include "nel/gui/group_html.h"

code/nel/src/gui/libwww_nel_stream.cpp

@@ -21,16 +21,16 @@ extern "C"
 {
 
 	/* Library Includes */
-#include "libwww/wwwsys.h"
+#include "wwwsys.h"
-#include "libwww/WWWUtil.h"
+#include "WWWUtil.h"
-#include "libwww/WWWCore.h"
+#include "WWWCore.h"
-#include "libwww/WWWDir.h"
+#include "WWWDir.h"
-#include "libwww/WWWTrans.h"
+#include "WWWTrans.h"
-#include "libwww/HTReqMan.h"
+#include "HTReqMan.h"
-#include "libwww/HTBind.h"
+#include "HTBind.h"
-#include "libwww/HTMulti.h"
+#include "HTMulti.h"
-#include "libwww/HTNetMan.h"
+#include "HTNetMan.h"
-#include "libwww/HTChannl.h"
+#include "HTChannl.h"
 #include "nel/gui/libwww_nel_stream.h"		/* Implemented here */
 }
 

code/ryzom/CMakeLists.txt

@@ -10,6 +10,10 @@ SET(RZ_SERVER_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/server/src)
 ADD_SUBDIRECTORY(common)
 
 IF(WITH_RYZOM_CLIENT)
+  IF(NOT WITH_GUI)
+    MESSAGE( FATAL_ERROR "The client cannot be built without the NeL GUI Library (WITH_GUI)")
+  ENDIF(NOT WITH_GUI)
+
   IF(WITH_LUA51)
     FIND_PACKAGE(Lua51 REQUIRED)
   ELSE(WITH_LUA51)
@@ -41,8 +45,6 @@ IF(WITH_RYZOM_CLIENT)
     ENDIF(APPLE)
   ENDIF(CURL_STATIC)
 
-  FIND_PACKAGE(Libwww REQUIRED)
-
   ADD_SUBDIRECTORY(client)
 ENDIF(WITH_RYZOM_CLIENT)