diff --git a/trunk/CMakeLists.txt b/trunk/CMakeLists.txt index e559a76..ccc6f58 100644 --- a/trunk/CMakeLists.txt +++ b/trunk/CMakeLists.txt @@ -1,111 +1,111 @@ cmake_minimum_required(VERSION 2.8) project(xmount C) include(CheckIncludeFiles) #include(CheckCSourceCompiles) # Only for internal packaging only #set(STATIC 1) if(STATIC) set(STATIC_EWF 1) set(STATIC_AFF 1) endif(STATIC) if(STATIC_AFF) if(NOT LINUX_DIST) set(LINUX_DIST "debian7") else(NOT LINUX_DIST) if(NOT (LINUX_DIST STREQUAL "debian7" OR LINUX_DIST STREQUAL "rhel7")) message(FATAL_ERROR "Only Linux dists 'debian7' and 'rhel7' are supported!") endif(NOT (LINUX_DIST STREQUAL "debian7" OR LINUX_DIST STREQUAL "rhel7")) endif(NOT LINUX_DIST) endif(STATIC_AFF) -add_definitions(-DXMOUNT_VERSION="0.7.5") +add_definitions(-DXMOUNT_VERSION="0.7.6") if(APPLE) # On OSx, do not try to find frameworks but only std headers / libraries set(CMAKE_FIND_FRAMEWORK "NEVER") endif(APPLE) # Make sure CMAKE_BUILD_TYPE is set if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") else(NOT CMAKE_BUILD_TYPE) if(NOT (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "Debug")) message(FATAL_ERROR "Only build types 'Release' and 'Debug' are supported!") endif(NOT (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "Debug")) endif(NOT CMAKE_BUILD_TYPE) # Add cmake_modules dir to CMAKE_MODULE_PATH set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules/") # Check required headers check_include_files(stdlib.h HAVE_STDLIB_H) check_include_files(stdio.h HAVE_STDIO_H) check_include_files(stdint.h HAVE_STDINT_H) check_include_files(stdarg.h HAVE_STDARG_H) check_include_files(string.h HAVE_STRING_H) check_include_files(errno.h HAVE_ERRNO_H) check_include_files(fcntl.h HAVE_FCNTL_H) check_include_files(dlfcn.h HAVE_DLFCN_H) check_include_files(dirent.h HAVE_DIRENT_H) check_include_files(unistd.h HAVE_UNISTD_H) check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H) check_include_files(sys/stat.h HAVE_SYS_STAT_H) check_include_files(sys/types.h HAVE_SYS_TYPES_H) check_include_files(linux/fs.h HAVE_LINUX_FS_H) check_include_files(grp.h HAVE_GRP_H) check_include_files(pwd.h HAVE_PWD_H) check_include_files(pthread.h HAVE_PTHREAD_H) check_include_files(time.h HAVE_TIME_H) check_include_files(inttypes.h HAVE_INTTYPES_H) check_include_files(byteswap.h HAVE_BYTESWAP_H) check_include_files(endian.h HAVE_ENDIAN_H) check_include_files(libkern/OSByteOrder.h HAVE_LIBKERN_OSBYTEORDER_H) # Check for required libs if(NOT APPLE) find_package(LibFUSE REQUIRED) else(NOT APPLE) # On OSx, search for osxfuse find_package(LibOSXFUSE REQUIRED) endif(NOT APPLE) # Generate config.h and add it's path to the include dirs configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) # Add preprocessor definitions add_definitions(-D_LARGEFILE64_SOURCE) add_definitions(-D_FILE_OFFSET_BITS=64) add_definitions(-D_GNU_SOURCE) set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall") set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}") # Check that off_t can represent 2**63 - 1 correctly. # If it can't, we need to set _FILE_OFFSET_BITS=64 #check_c_source_compiles(" # #include # #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) # int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; # int main() { return 0; } #" _OFFT_IS_64BIT) #if(NOT ${_OFFT_IS_64BIT}) # set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-D_FILE_OFFSET_BITS=64") #endif(NOT ${_OFFT_IS_64BIT}) # Compile stuff in sub dirs add_subdirectory(libxmount_input) add_subdirectory(libxmount_morphing) add_subdirectory(src) # Install man page INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/xmount.1 DESTINATION share/man/man1) diff --git a/trunk/xmount.pmdoc/index.xml b/trunk/xmount.pmdoc/index.xml index 3f7f990..b483e1d 100644 --- a/trunk/xmount.pmdoc/index.xml +++ b/trunk/xmount.pmdoc/index.xml @@ -1,103 +1,111 @@ xmount PMDOC_VERSION PMDOC_CWD/xmount-PMDOC_VERSION.pkg www.pinguin.lu function check_for_fuse() { // Installed using .pkg if(system.files.fileExistsAtPath('/Library/Filesystems/osxfusefs.fs')==true) { return true; + } + // Same as above but for newer osxfuse versions + if(system.files.fileExistsAtPath('/Library/Filesystems/osxfuse.fs')==true) { + return true; } // Installed trough MacPorts if(system.files.fileExistsAtPath('/opt/local/Library/Filesystems/osxfusefs.fs')==true) { return true; + } + // Same as above but for newer osxfuse versions + if(system.files.fileExistsAtPath('/opt/local/Library/Filesystems/osxfuse.fs')==true) { + return true; } return false; } .\ \ This version of xmount includes the following statically linked libraries:\ \ ==== LIBEWF\ Copyright (c) 2006-2009, Joachim Metz , Hoffmann Investigations.\ \ This software is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ \ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ \ You should have received a copy of the GNU Lesser General Public License along with this software. If not, see .\ \ ==== AFFLIB\ Copyright (c) 2005, 2006, 2007 Simson L. Garfinkel and Basis Technology Corp. All rights reserved.\ \ This code is derrived from software contributed by Simson L. Garfinkel\ \ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\ \ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\ 3. All advertising materials mentioning features or use of this software must display the following acknowledgement:\ This product includes software developed by Simson L. Garfinkel and Basis Technology Corp.\ 4. Neither the name of Simson L. Garfinkel, Basis Technology, or other contributors to this program may be used to endorse or promote products derived from this software without specific prior written permission.\ \ THIS SOFTWARE IS PROVIDED BY SIMSON L. GARFINKEL, BASIS TECHNOLOGY, AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SIMSON L. GARFINKEL, BASIS TECHNOLOGY, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ \ AFF and AFFLIB is a trademark of Simson Garfinkel and Basis Technology Corp.}]]> check_for_fuse() FUSE missing Your system is missing FUSE support. Please install FUSE for OS X from https://osxfuse.github.io/ prior to launching this installer. 01dstroot.xml properties.systemDomain properties.title