Merge branch 'master' of https://github.com/ivansafrin/Polycode

Author: ivansafrin

.gitignore

@@ -27,6 +27,8 @@
 *.exp
 *.zip
 *.swo
+*.swm
+*.swn
 *.opensdf
 *.user.*
 *.xcuserstate

CMake/ExternalLibArchive.cmake

@@ -0,0 +1,28 @@
+# Build a local version
+INCLUDE(ExternalProject)
+
+SET(libarchive_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libarchive)
+
+SET(libarchive_CMAKE_ARGS
+    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> 
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+    -DENABLE_ICONV=OFF
+    -DENABLE_TAR=OFF
+    -DENABLE_OPENSSL=OFF
+    -DENABLE_TEST=OFF
+    -DCMAKE_DEBUG_POSTFIX=d
+)
+
+ExternalProject_Add(libarchive
+    PREFIX ${libarchive_PREFIX}
+
+    DOWNLOAD_DIR ${POLYCODE_DEPS_DOWNLOAD_DIR}
+    
+    URL http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz
+    URL_MD5 efad5a503f66329bb9d2f4308b5de98a
+    
+    INSTALL_DIR ${POLYCODE_DEPS_TOOLS_PREFIX}
+    CMAKE_ARGS ${libarchive_CMAKE_ARGS}
+)

CMake/FindLibArchive.cmake

@@ -0,0 +1,52 @@
+#  LIBARCHIVE_FOUND - system has Libarchive
+#  LIBARCHIVE_INCLUDE_DIR - the Libarchive include directory
+#  LIBARCHIVE_LIBRARY - Link these to use Libarchive
+#  LIBARCHIVE_LIBRARIES
+
+SET(LIBARCHIVE_SEARCH_PATHS
+	${POLYCODE_RELEASE_DIR}/Framework/Tools/Dependencies/lib
+	${POLYCODE_RELEASE_DIR}/Framework/Tools/Dependencies/include/
+)
+
+SET(CMAKE_FIND_LIBRARY_SUFFIXES
+	.a
+	.lib
+)
+
+
+find_path (LIBARCHIVE_INCLUDE_DIR NAMES archive.h
+	HINTS
+	NO_DEFAULT_PATH
+	NO_CMAKE_ENVIRONMENT_PATH
+	NO_CMAKE_SYSTEM_PATH
+	NO_SYSTEM_ENVIRONMENT_PATH
+	NO_CMAKE_PATH
+	CMAKE_FIND_FRAMEWORK NEVER
+	PATH_SUFFIXES lib lib64 win32/Dynamic_Release "Win32/${MSVC_YEAR_NAME}/x64/Release" "Win32/${MSVC_YEAR_NAME}/Win32/Release"
+	PATHS ${LIBARCHIVE_SEARCH_PATHS}
+)
+ 
+find_library (LIBARCHIVE_LIBRARY_DEBUG NAMES archived libarchived libarchive_d PATHS ${LIBARCHIVE_SEARCH_PATHS})
+find_library (LIBARCHIVE_LIBRARY_RELEASE NAMES archive libarchive PATHS ${LIBARCHIVE_SEARCH_PATHS})
+
+if (LIBARCHIVE_INCLUDE_DIR AND LIBARCHIVE_LIBRARY_RELEASE)
+  set(LIBARCHIVE_FOUND TRUE)
+endif()
+
+if (LIBARCHIVE_LIBRARY_RELEASE)
+    set (LIBARCHIVE_LIBRARY ${LIBARCHIVE_LIBRARY_RELEASE})
+endif()
+
+if (LIBARCHIVE_LIBRARY_DEBUG AND LIBARCHIVE_LIBRARY_RELEASE)
+    set (LIBARCHIVE_LIBRARY debug ${LIBARCHIVE_LIBRARY_DEBUG} optimized ${LIBARCHIVE_LIBRARY_RELEASE} )
+endif()
+
+
+if (LIBARCHIVE_FOUND)
+  MESSAGE("-- Found Libarchive: ${LIBARCHIVE_LIBRARY}")
+  mark_as_advanced (LIBARCHIVE_INCLUDE_DIR LIBARCHIVE_LIBRARY LIBARCHIVE_LIBRARIES)
+else()
+  MESSAGE("-- Could not find LibArchive!")
+endif()
+
+

CMake/PolycodeIncludes.cmake

@@ -20,6 +20,7 @@ FIND_PACKAGE(Ogg REQUIRED)
 FIND_PACKAGE(Vorbis REQUIRED)
 FIND_PACKAGE(VorbisFile REQUIRED)
 FIND_PACKAGE(Lua REQUIRED)
+FIND_PACKAGE(LibArchive REQUIRED)
 
 # Use SDL on non-Apple unixes
 IF(UNIX AND NOT APPLE)
@@ -39,4 +40,5 @@ INCLUDE_DIRECTORIES(
     ${PNG_INCLUDE_DIR}
     ${OPENGLEXT_INCLUDE_DIR}
     ${LUA_INCLUDE_DIR}
+    ${LIBARCHIVE_INCLUDE_DIR}
 )

Dependencies/CMakeLists.txt

@@ -125,6 +125,8 @@ ENDIF(APPLE)
     SET(internal_ASSIMP ON)
 #ENDIF(ASSIMP_FOUND)
 
+SET(internal_LIBARCHIVE ON)
+
 OPTION(POLYCODE_DEPS_GLEXT "Download GL/glext.h header" ${internal_GLEXT})
 OPTION(POLYCODE_DEPS_WGLEXT "Download GL/wglext.h header" ${internal_WGLEXT})
 
@@ -138,6 +140,7 @@ OPTION(POLYCODE_DEPS_LUA51 "Download and build the Lua51 package" ${internal_LUA
 OPTION(POLYCODE_DEPS_BOX2D "Download and build the Box2D package" ${internal_BOX2D})
 OPTION(POLYCODE_DEPS_BULLET "Download and build the Bullet package" ${internal_BULLET})
 OPTION(POLYCODE_DEPS_ASSIMP "Download and build the Assimp package" ${internal_ASSIMP})
+OPTION(POLYCODE_DEPS_LIBARCHIVE "Download and build the LibArchive package" ${internal_LIBARCHIVE})
 
 IF(POLYCODE_DEPS_PNG)
     INCLUDE(ExternalPNG)
@@ -175,6 +178,10 @@ IF(POLYCODE_DEPS_ASSIMP)
     INCLUDE(ExternalAssimp)
 ENDIF(POLYCODE_DEPS_ASSIMP)
 
+IF(POLYCODE_DEPS_LIBARCHIVE)
+    INCLUDE(ExternalLibArchive)
+ENDIF(POLYCODE_DEPS_LIBARCHIVE)
+
 # Use SDL on non-Apple unixes
 #IF(UNIX AND NOT APPLE)
 #    FIND_PACKAGE(SDL REQUIRED)