r18595 by fschmid - Adding a replacement library for our own zip handling classes.

[scribus-commit]

Author: fschmid
Date: Sun Nov 24 10:45:16 2013
New Revision: 18595

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18595
Log:
Adding a replacement library for our own zip handling classes.

Added:
    trunk/Scribus/scribus/third_party/zip/
    trunk/Scribus/scribus/third_party/zip/CHANGELOG   (with props)
    trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
    trunk/Scribus/scribus/third_party/zip/LICENSE.GPL   (with props)
    trunk/Scribus/scribus/third_party/zip/README   (with props)
    trunk/Scribus/scribus/third_party/zip/scribus_zip.cpp
    trunk/Scribus/scribus/third_party/zip/scribus_zip.h
    trunk/Scribus/scribus/third_party/zip/unzip.cpp   (with props)
    trunk/Scribus/scribus/third_party/zip/unzip.h   (with props)
    trunk/Scribus/scribus/third_party/zip/unzip_p.h   (with props)
    trunk/Scribus/scribus/third_party/zip/zip.cpp   (with props)
    trunk/Scribus/scribus/third_party/zip/zip.h   (with props)
    trunk/Scribus/scribus/third_party/zip/zip_p.h   (with props)
    trunk/Scribus/scribus/third_party/zip/zipentry_p.h   (with props)
    trunk/Scribus/scribus/third_party/zip/zipglobal.cpp   (with props)
    trunk/Scribus/scribus/third_party/zip/zipglobal.h   (with props)
Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/third_party/CMakeLists.txt

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18595&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sun Nov 24 10:45:16 2013
@@ -482,7 +482,7 @@
   ui/copypagetomasterpagedialog.h
   ui/createrange.h
   ui/edittoolbar.h
-  ui/filetoolbar.h  
+  ui/filetoolbar.h
   ui/modetoolbar.h
   ui/pdftoolbar.h
   ui/unicodesearch.h
@@ -985,6 +985,7 @@
   ${CMAKE_CURRENT_BINARY_DIR}/text
   ${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg
   ${CMAKE_CURRENT_BINARY_DIR}/third_party/pgf
+  ${CMAKE_CURRENT_BINARY_DIR}/third_party/zip
 )
 
 IF(WITH_TESTS)
@@ -1018,6 +1019,7 @@
 SET(SCRIBUS_WPG_LIB "scribus_wpg_lib")
 
 SET(SCRIBUS_PGF_LIB "scribus_pgf_lib")
+SET(SCRIBUS_ZIP_LIB "scribus_zip_lib")
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}
@@ -1188,13 +1190,14 @@
   ${SCRIBUS_FONTS_LIB}
   ${SCRIBUS_WPG_LIB}
   ${SCRIBUS_PGF_LIB}
+  ${SCRIBUS_ZIP_LIB}
   ${LCMS2_LIBRARIES}
 )
 
 IF(WITH_TESTS)
-  TARGET_LINK_LIBRARIES(${EXE_NAME} 
+  TARGET_LINK_LIBRARIES(${EXE_NAME}
   	${QT_QTTEST_LIBRARY}
-	${SCRIBUS_TESTS_LIB} 
+	${SCRIBUS_TESTS_LIB}
   )
 ENDIF(WITH_TESTS)
 
@@ -1268,7 +1271,7 @@
 #  )
 
 #  INSTALL(
-#	CODE "SET(input_file ${CMAKE_INSTALL_PREFIX}/MacOS/${EXE_NAME})"  
+#	CODE "SET(input_file ${CMAKE_INSTALL_PREFIX}/MacOS/${EXE_NAME})"
 #	SCRIPT ${CMAKE_MODULE_PATH}/ScribusIngestOSXBundleLibraries.cmake )
 ELSE(APPLEBUNDLE)
   IF(WIN32)
@@ -1287,8 +1290,8 @@
 #Install our header files, selected from all existing dirs, excluding unwanted directories and svn files
 IF(NOT WANT_NOHEADERINSTALL)
   MESSAGE(STATUS "Source header files will be installed")
-  INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${INCLUDEDIR} 
-    FILES_MATCHING 
+  INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${INCLUDEDIR}
+    FILES_MATCHING
     PATTERN "*.h"
     PATTERN "dicts" EXCLUDE
     PATTERN "doc" EXCLUDE
@@ -1297,7 +1300,7 @@
     PATTERN "icon*" EXCLUDE
     PATTERN "manpages" EXCLUDE
     PATTERN "old" EXCLUDE
-    PATTERN ".svn" EXCLUDE 
+    PATTERN ".svn" EXCLUDE
   )
 ELSE(NOT WANT_NOHEADERINSTALL)
   MESSAGE(STATUS "No source header files will be installed")

Modified: trunk/Scribus/scribus/third_party/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18595&path=/trunk/Scribus/scribus/third_party/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/CMakeLists.txt Sun Nov 24 10:45:16 2013
@@ -9,3 +9,4 @@
 ADD_SUBDIRECTORY(wpg)
 
 ADD_SUBDIRECTORY(pgf)
+ADD_SUBDIRECTORY(zip)