Changed: lua, luabind, libwww and libxml2 already linked to previous libraries (NLMISC and NLGUI)

code/nel/tools/3d/CMakeLists.txt

@@ -62,7 +62,7 @@ IF(WITH_NEL_TOOLS)
   ENDIF(WITH_QT)
   
   IF(SQUISH_FOUND)
-  ADD_SUBDIRECTORY(s3tc_compressor_lib)
+    ADD_SUBDIRECTORY(s3tc_compressor_lib)
     ADD_SUBDIRECTORY(panoply_maker)
     ADD_SUBDIRECTORY(tga_2_dds)
     ADD_SUBDIRECTORY(hls_bank_maker)

code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt

@@ -8,7 +8,7 @@ ADD_SUBDIRECTORY(object_viewer)
 ADD_SUBDIRECTORY(georges_editor)
 
 IF(WITH_GUI)
-ADD_SUBDIRECTORY(gui_editor)
+  ADD_SUBDIRECTORY(gui_editor)
 ENDIF(WITH_GUI)
 
 ADD_SUBDIRECTORY(translation_manager)

code/nel/tools/3d/object_viewer_qt/src/plugins/gui_editor/CMakeLists.txt

@@ -1,40 +1,7 @@
-IF(WITH_LUA51)
-	FIND_PACKAGE(Lua51 REQUIRED)
-ELSE(WITH_LUA51)
-	FIND_PACKAGE(Lua50 REQUIRED)
-ENDIF(WITH_LUA51)
-	FIND_PACKAGE(Luabind REQUIRED)
-	FIND_PACKAGE(CURL REQUIRED)
-	
-IF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
-	SET(CURL_STATIC ON)
-ENDIF(WIN32 OR CURL_LIBRARIES MATCHES "\\.a")
-
-IF(CURL_STATIC)
-	SET(CURL_DEFINITIONS -DCURL_STATICLIB)
-	FIND_PACKAGE(OpenSSL QUIET)
-	
-	IF(OPENSSL_FOUND)
-		SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
-		SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
-	ENDIF(OPENSSL_FOUND)
-	
-	# CURL Macports version depends on libidn, libintl and libiconv too
-	IF(APPLE)
-		FIND_LIBRARY(IDN_LIBRARY idn)
-		FIND_LIBRARY(INTL_LIBRARY intl)
-		SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${IDN_LIBRARY} ${INTL_LIBRARY})
-	ENDIF(APPLE)
-ENDIF(CURL_STATIC)
-
-FIND_PACKAGE(Libwww REQUIRED)
-
-
-INCLUDE_DIRECTORIES(	${CMAKE_CURRENT_BINARY_DIR}
-			${CMAKE_CURRENT_SOURCE_DIR}
-			${LIBXML2_INCLUDE_DIR}
-			${LUA_INCLUDE_DIR}
-			${QT_INCLUDES})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${LIBXML2_INCLUDE_DIR}
+  ${QT_INCLUDES})
 
 FILE(GLOB SRC *.cpp *.h)
 
@@ -105,11 +72,6 @@ TARGET_LINK_LIBRARIES(
 						${QT_LIBRARIES}
 						${QT_QTOPENGL_LIBRARY}
 						qt_property_browser
-						${LUA_LIBRARIES}
-						${LUABIND_LIBRARIES}
-						${CURL_LIBRARIES}
-						${LIBWWW_LIBRARIES}
-						${LIBXML2_LIBRARIES}
 						)
 
 NL_DEFAULT_PROPS(ovqt_plugin_gui_editor "NeL, Tools, 3D: Object Viewer Qt Plugin: GUI Editor")