Move 7zip library

--HG--
branch : feature-streamed-package

code/CMakeLists.txt

@@ -177,6 +177,7 @@ IF(WITH_NEL)
   ENDIF(WITH_GUI)
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include ${LIBXML2_INCLUDE_DIR})
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/3rdparty)
   ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
   ADD_SUBDIRECTORY(nel)
 ENDIF(WITH_NEL)

code/nel/3rdparty/CMakeLists.txt

@@ -0,0 +1,2 @@
+SET(SEVENZIP_LIBRARY "nel_sevenzip")
+ADD_SUBDIRECTORY(seven_zip)

code/nel/3rdparty/seven_zip/CMakeLists.txt

@@ -0,0 +1,27 @@
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+FILE(GLOB LIB_SRC *.cpp *.h)
+
+LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
+
+NL_TARGET_LIB(nel_sevenzip ${LIB_SRC})
+# TARGET_LINK_LIBRARIES(nel_sevenzip ${PLATFORM_LINKFLAGS})
+NL_DEFAULT_PROPS(nel_sevenzip "NeL, 3rd Party: Seven Zip")
+NL_ADD_RUNTIME_FLAGS(nel_sevenzip)
+NL_ADD_LIB_SUFFIX(nel_sevenzip)
+
+ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY)
+
+IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+  INSTALL(TARGETS nel_sevenzip LIBRARY DESTINATION ${NL_LIB_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT libraries)
+ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
+
+IF(WITH_TOOLS)
+  ADD_EXECUTABLE(7zDec ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
+
+  TARGET_LINK_LIBRARIES(7zDec nel_sevenzip)
+  NL_DEFAULT_PROPS(7zDec "NeL, 3rd Party: Seven Zip Decoder")
+  NL_ADD_RUNTIME_FLAGS(7zDec)
+
+  INSTALL(TARGETS 7zDec RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools)
+ENDIF(WITH_TOOLS)

code/nel/CMakeLists.txt

@@ -70,6 +70,7 @@ IF(WITH_INSTALL_LIBRARIES)
   ADD_SUBDIRECTORY(include)
 ENDIF(WITH_INSTALL_LIBRARIES)
 
+ADD_SUBDIRECTORY(3rdparty)
 ADD_SUBDIRECTORY(src)
 
 IF(WITH_NEL_SAMPLES)

code/nel/src/misc/CMakeLists.txt

@@ -39,7 +39,7 @@ ENDIF(UNIX)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
 
-TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY})
+TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY} nel_sevenzip)
 SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc")
 NL_ADD_RUNTIME_FLAGS(nelmisc)

code/ryzom/client/src/CMakeLists.txt

@@ -5,9 +5,7 @@ ADD_SUBDIRECTORY(client_sheets)
 IF(WITH_RYZOM_CLIENT)
 
 # These are Windows/MFC apps
-SET(SEVENZIP_LIBRARY "ryzom_sevenzip")
 
-ADD_SUBDIRECTORY(seven_zip)
 
 IF(WITH_RYZOM_PATCH)
   ADD_DEFINITIONS(-DRZ_USE_PATCH)

code/ryzom/client/src/seven_zip/CMakeLists.txt

@@ -1,27 +0,0 @@
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-
-FILE(GLOB LIB_SRC *.cpp *.h)
-
-LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
-
-NL_TARGET_LIB(ryzom_sevenzip ${LIB_SRC})
-# TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS})
-NL_DEFAULT_PROPS(ryzom_sevenzip "Ryzom, Library: Seven Zip")
-NL_ADD_RUNTIME_FLAGS(ryzom_sevenzip)
-NL_ADD_LIB_SUFFIX(ryzom_sevenzip)
-
-ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY)
-
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
-  INSTALL(TARGETS ryzom_sevenzip LIBRARY DESTINATION ${RYZOM_LIB_PREFIX} ARCHIVE DESTINATION ${RYZOM_LIB_PREFIX} COMPONENT libraries)
-ENDIF((WITH_INSTALL_LIBRARIES AND WITH_STATIC) OR NOT WITH_STATIC)
-
-IF(WITH_RYZOM_TOOLS)
-  ADD_EXECUTABLE(7zDec ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
-
-  TARGET_LINK_LIBRARIES(7zDec ryzom_sevenzip)
-  NL_DEFAULT_PROPS(7zDec "Ryzom, Tools, Misc: Seven Zip Decoder")
-  NL_ADD_RUNTIME_FLAGS(7zDec)
-
-  INSTALL(TARGETS 7zDec RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT tools)
-ENDIF(WITH_RYZOM_TOOLS)

code/ryzom/tools/client/client_patcher/CMakeLists.txt

@@ -19,7 +19,7 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
 				nelmisc
 				nelnet
 				ryzom_gameshare
-				ryzom_sevenzip
+				nel_sevenzip
 				${CURL_LIBRARIES})
 
 IF(APPLE)