157 lines
6.2 KiB
Diff
Executable file
157 lines
6.2 KiB
Diff
Executable file
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b2634da6..0d846877 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -148,10 +148,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$")
|
|
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -qinfo=pro:use")
|
|
ENDIF(CMAKE_C_COMPILER_ID MATCHES "^XL$")
|
|
IF (MSVC)
|
|
- if (ENABLE_WERROR)
|
|
- # /WX option is the same as gcc's -Werror option.
|
|
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
|
- endif ()
|
|
#################################################################
|
|
# Set compile flags for debug build.
|
|
# This is added into CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is "Debug"
|
|
@@ -382,8 +378,6 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}")
|
|
# Maybe DLL path is "C:/Program Files/GnuWin32/bin".
|
|
# The zlib and the bzip2 Setup program have installed programs and DLLs into
|
|
# "C:/Program Files/GnuWin32" by default.
|
|
- # This is convenience setting for Windows.
|
|
- SET(CMAKE_PREFIX_PATH ${__GNUWIN32PATH} $(CMAKE_PREFIX_PATH))
|
|
#
|
|
# If you didn't use Setup program or installed into nonstandard path,
|
|
# cmake cannot find out your zlib or bzip2 libraries and include files,
|
|
@@ -420,14 +414,7 @@ IF(ZLIB_FOUND)
|
|
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
|
|
LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
|
|
IF(WIN32 AND NOT CYGWIN)
|
|
- #
|
|
- # Test if ZLIB_WINAPI macro is needed to use.
|
|
- #
|
|
- TRY_MACRO_FOR_LIBRARY(
|
|
- "${ZLIB_INCLUDE_DIR}" "${ZLIB_LIBRARIES}"
|
|
- RUNS
|
|
- "#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
|
|
- ZLIB_WINAPI)
|
|
+ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box
|
|
IF(ZLIB_WINAPI)
|
|
ADD_DEFINITIONS(-DZLIB_WINAPI)
|
|
ELSE(ZLIB_WINAPI)
|
|
@@ -487,8 +474,6 @@ IF(LIBLZMA_FOUND)
|
|
SET(HAVE_LIBLZMA 1)
|
|
SET(HAVE_LZMA_H 1)
|
|
CMAKE_PUSH_CHECK_STATE()
|
|
- SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
|
|
- SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
|
|
INCLUDE_DIRECTORIES(${LIBLZMA_INCLUDE_DIRS})
|
|
LIST(APPEND ADDITIONAL_LIBS ${LIBLZMA_LIBRARIES})
|
|
# Test if a macro is needed for the library.
|
|
@@ -1356,7 +1341,7 @@ CHECK_FUNCTION_EXISTS_GLIBC(localtime_r HAVE_LOCALTIME_R)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(lstat HAVE_LSTAT)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(lutimes HAVE_LUTIMES)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(mbrtowc HAVE_MBRTOWC)
|
|
-CHECK_FUNCTION_EXISTS_GLIBC(memmove HAVE_MEMMOVE)
|
|
+set(HAVE_MEMMOVE 1)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(mkdir HAVE_MKDIR)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(mkfifo HAVE_MKFIFO)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(mknod HAVE_MKNOD)
|
|
@@ -1388,11 +1373,11 @@ CHECK_FUNCTION_EXISTS_GLIBC(utime HAVE_UTIME)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(utimes HAVE_UTIMES)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(utimensat HAVE_UTIMENSAT)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(vfork HAVE_VFORK)
|
|
-CHECK_FUNCTION_EXISTS_GLIBC(wcrtomb HAVE_WCRTOMB)
|
|
-CHECK_FUNCTION_EXISTS_GLIBC(wcscmp HAVE_WCSCMP)
|
|
-CHECK_FUNCTION_EXISTS_GLIBC(wcscpy HAVE_WCSCPY)
|
|
-CHECK_FUNCTION_EXISTS_GLIBC(wcslen HAVE_WCSLEN)
|
|
-CHECK_FUNCTION_EXISTS_GLIBC(wctomb HAVE_WCTOMB)
|
|
+set(HAVE_WCRTOMB 1)
|
|
+set(HAVE_WCSCMP 1)
|
|
+set(HAVE_WCSCPY 1)
|
|
+set(HAVE_WCSLEN 1)
|
|
+set(HAVE_WCTOMB 1)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(_ctime64_s HAVE__CTIME64_S)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(_fseeki64 HAVE__FSEEKI64)
|
|
CHECK_FUNCTION_EXISTS_GLIBC(_get_timezone HAVE__GET_TIMEZONE)
|
|
@@ -1405,10 +1390,10 @@ CHECK_FUNCTION_EXISTS(cygwin_conv_path HAVE_CYGWIN_CONV_PATH)
|
|
CHECK_FUNCTION_EXISTS(fseeko HAVE_FSEEKO)
|
|
CHECK_FUNCTION_EXISTS(strerror_r HAVE_STRERROR_R)
|
|
CHECK_FUNCTION_EXISTS(strftime HAVE_STRFTIME)
|
|
-CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF)
|
|
-CHECK_FUNCTION_EXISTS(wmemcmp HAVE_WMEMCMP)
|
|
-CHECK_FUNCTION_EXISTS(wmemcpy HAVE_WMEMCPY)
|
|
-CHECK_FUNCTION_EXISTS(wmemmove HAVE_WMEMMOVE)
|
|
+set(HAVE_VPRINTF 1)
|
|
+set(HAVE_WMEMCMP 1)
|
|
+set(HAVE_WMEMCPY 1)
|
|
+set(HAVE_WMEMMOVE 1)
|
|
|
|
CMAKE_POP_CHECK_STATE() # Restore the state of the variables
|
|
|
|
@@ -1449,6 +1434,9 @@ CHECK_C_SOURCE_COMPILES(
|
|
"#include <sys/sysmacros.h>\nint main() { return major(256); }"
|
|
MAJOR_IN_SYSMACROS)
|
|
|
|
+CMAKE_PUSH_CHECK_STATE()
|
|
+SET(CMAKE_REQUIRED_INCLUDES ${LIBLZMA_INCLUDE_DIR})
|
|
+SET(CMAKE_REQUIRED_LIBRARIES ${LIBLZMA_LIBRARIES})
|
|
IF(ENABLE_LZMA)
|
|
CHECK_C_SOURCE_COMPILES(
|
|
"#include <lzma.h>\n#if LZMA_VERSION < 50020000\n#error unsupported\n#endif\nint main(void){lzma_stream_encoder_mt(0, 0); return 0;}"
|
|
@@ -1456,6 +1444,7 @@ CHECK_C_SOURCE_COMPILES(
|
|
ELSE()
|
|
SET(HAVE_LZMA_STREAM_ENCODER_MT 0)
|
|
ENDIF(ENABLE_LZMA)
|
|
+CMAKE_POP_CHECK_STATE()
|
|
|
|
IF(HAVE_STRERROR_R)
|
|
SET(HAVE_DECL_STRERROR_R 1)
|
|
@@ -2018,7 +2007,7 @@ INCLUDE(CreatePkgConfigFile)
|
|
#
|
|
# Register installation of PDF documents.
|
|
#
|
|
-IF(WIN32 AND NOT CYGWIN)
|
|
+IF(0)
|
|
#
|
|
# On Windows platform, It's better that we install PDF documents
|
|
# on one's computer.
|
|
diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
|
|
index 9389bbc9..c34a42b2 100644
|
|
--- a/libarchive/CMakeLists.txt
|
|
+++ b/libarchive/CMakeLists.txt
|
|
@@ -236,28 +236,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS)
|
|
ENDIF()
|
|
|
|
# Libarchive is a shared library
|
|
-ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
|
|
+ADD_LIBRARY(archive ${libarchive_SOURCES} ${include_HEADERS})
|
|
TARGET_INCLUDE_DIRECTORIES(archive PUBLIC .)
|
|
TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS})
|
|
-SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
|
|
-
|
|
-# archive_static is a static library
|
|
-ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
|
|
-TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
|
|
-SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
|
|
+IF(BUILD_SHARED_LIBS)
|
|
+ SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
|
|
+ELSE()
|
|
+ SET_TARGET_PROPERTIES(archive PROPERTIES COMPILE_DEFINITIONS
|
|
LIBARCHIVE_STATIC)
|
|
-# On Posix systems, libarchive.so and libarchive.a can co-exist.
|
|
-IF(NOT WIN32 OR CYGWIN)
|
|
- SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
|
|
-ENDIF(NOT WIN32 OR CYGWIN)
|
|
+ENDIF()
|
|
|
|
IF(ENABLE_INSTALL)
|
|
# How to install the libraries
|
|
- INSTALL(TARGETS archive archive_static
|
|
+ INSTALL(TARGETS archive
|
|
RUNTIME DESTINATION bin
|
|
LIBRARY DESTINATION lib
|
|
ARCHIVE DESTINATION lib)
|
|
- INSTALL_MAN(${libarchive_MANS})
|
|
INSTALL(FILES ${include_HEADERS} DESTINATION include)
|
|
ENDIF()
|
|
|