File gzdoom-lzma.patch of Package gzdoom

Overview Repositories Revisions Requests Users Attributes Meta

File gzdoom-lzma.patch of Package gzdoom (Revision 75bd5135cda9809b20d0390dde12c304)

Currently displaying revision 75bd5135cda9809b20d0390dde12c304 , Show latest

---
 CMakeLists.txt              |    4 ++--
 src/CMakeLists.txt          |    4 ++--
 tools/zipdir/CMakeLists.txt |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

Index: gzdoom-3.7.1/CMakeLists.txt
===================================================================
--- gzdoom-3.7.1.orig/CMakeLists.txt
+++ gzdoom-3.7.1/CMakeLists.txt
@@ -12,6 +12,7 @@ endif()
 
 list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 include( FindPackageHandleStandardArgs )
+include(FindPkgConfig)
 
 # Produce a warning if XP support will be missing when building a 32 bit target for MSVC.
 if( MSVC )
@@ -336,7 +337,7 @@ else()
 	set( GME_LIBRARIES gme )
 endif()
 
-set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lzma/C" )
+pkg_check_modules(LZMA REQUIRED clzma)
 
 if( NOT CMAKE_CROSSCOMPILING )
 	if( NOT CROSS_EXPORTS )
@@ -354,7 +355,6 @@ install(DIRECTORY docs/
 		DESTINATION ${INSTALL_DOCS_PATH}
 		COMPONENT "Documentation")
 
-add_subdirectory( lzma )
 add_subdirectory( tools )
 add_subdirectory( dumb )
 add_subdirectory( gdtoa )
Index: gzdoom-3.7.1/src/CMakeLists.txt
===================================================================
--- gzdoom-3.7.1.orig/src/CMakeLists.txt
+++ gzdoom-3.7.1/src/CMakeLists.txt
@@ -461,7 +461,7 @@ add_custom_target( revision_check ALL
 
 message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
 set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${ASMJIT_LIBRARIES}" "${CMAKE_DL_LIBS}" )
-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" )
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ASMJIT_INCLUDE_DIR}" )
 
 if( SNDFILE_FOUND )
     set( ZDOOM_LIBS ${ZDOOM_LIBS} "${SNDFILE_LIBRARIES}" )
@@ -1301,7 +1301,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS"
 	set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket)
 endif()
 
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma )
+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb ${LZMA_LIBRARIES})
 
 include_directories( .
 	g_statusbar
Index: gzdoom-3.7.1/tools/zipdir/CMakeLists.txt
===================================================================
--- gzdoom-3.7.1.orig/tools/zipdir/CMakeLists.txt
+++ gzdoom-3.7.1/tools/zipdir/CMakeLists.txt
@@ -1,9 +1,9 @@
 cmake_minimum_required( VERSION 2.8.7 )
 
 if( NOT CMAKE_CROSSCOMPILING )
-	include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" )
+	include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIRS}" )
 	add_executable( zipdir
 		zipdir.c )
-	target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} lzma )
+	target_link_libraries( zipdir ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LZMA_LDFLAGS})
 	set( CROSS_EXPORTS ${CROSS_EXPORTS} zipdir PARENT_SCOPE )
 endif()

Places

File gzdoom-lzma.patch of Package gzdoom (Revision 75bd5135cda9809b20d0390dde12c304)

Places