From: Jan Engelhardt Date: 2018-01-08 13:48:59+0100 Use LZMA system libraries instead of bundled code. --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 4 ++-- tools/zipdir/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) Index: gzdoom-g4.12.2/CMakeLists.txt =================================================================== --- gzdoom-g4.12.2.orig/CMakeLists.txt +++ gzdoom-g4.12.2/CMakeLists.txt @@ -50,6 +50,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) include( FindPackageHandleStandardArgs ) +include(FindPkgConfig) # Support cross compiling option( FORCE_CROSSCOMPILE "Turn on cross compiling." NO ) @@ -385,7 +386,7 @@ else() set( BZIP2_LIBRARY bz2 ) endif() -set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" ) +pkg_check_modules(LZMA REQUIRED clzma) if( NOT CMAKE_CROSSCOMPILING ) if( NOT CROSS_EXPORTS ) @@ -405,7 +406,6 @@ install(DIRECTORY docs/ option( DYN_OPENAL "Dynamically load OpenAL" ON ) -add_subdirectory( libraries/lzma ) add_subdirectory( libraries/miniz ) add_subdirectory( tools ) add_subdirectory( wadsrc ) Index: gzdoom-g4.12.2/src/CMakeLists.txt =================================================================== --- gzdoom-g4.12.2.orig/src/CMakeLists.txt +++ gzdoom-g4.12.2/src/CMakeLists.txt @@ -383,7 +383,7 @@ else() message( SEND_ERROR "Could not find libvpx" ) endif() -include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") +include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${ZMUSIC_INCLUDE_DIR}" "${DRPC_INCLUDE_DIR}") if( ${HAVE_VM_JIT} ) add_definitions( -DHAVE_VM_JIT ) @@ -1267,7 +1267,7 @@ if( UNIX ) endif() endif() -target_link_libraries( zdoom ${PROJECT_LIBRARIES} lzma ${ZMUSIC_LIBRARIES} ) +target_link_libraries( zdoom ${PROJECT_LIBRARIES} ${LZMA_LIBRARIES} ${ZMUSIC_LIBRARIES} ) include_directories( BEFORE Index: gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt =================================================================== --- gzdoom-g4.12.2.orig/tools/zipdir/CMakeLists.txt +++ gzdoom-g4.12.2/tools/zipdir/CMakeLists.txt @@ -1,9 +1,9 @@ cmake_minimum_required( VERSION 3.16 ) if( NOT CMAKE_CROSSCOMPILING ) - include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" ) + include_directories( SYSTEM "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" ) add_executable( zipdir zipdir.c ) - target_link_libraries( zipdir miniz ${BZIP2_LIBRARIES} lzma ) + target_link_libraries( zipdir miniz ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS} ) set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE ) endif()