From 23077d119b32a6ee9d1e012ed87ef39b732f16b0 Mon Sep 17 00:00:00 2001 From: Gregory King Date: Mon, 17 Mar 2014 13:46:02 -0700 Subject: [PATCH] Updated voglcore/CMakeLists.txt removing lzma_*.cpp; (1) Replaced compiling of lzma and lzmadec with ${LZMA_LIBRARIES}; (2) Added include for lzma; --- src/voglcore/CMakeLists.txt | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/voglcore/CMakeLists.txt b/src/voglcore/CMakeLists.txt index 476cb3a..8e4bd65 100644 --- a/src/voglcore/CMakeLists.txt +++ b/src/voglcore/CMakeLists.txt @@ -10,7 +10,8 @@ endif () include("${SRC_DIR}/build_options.cmake") include_directories( - "${PROJECT_SOURCE_DIR}/../inc" + ${LZMA_INCLUDE_DIR} + ${LZMADEC_INCLUDE_DIR} "${SRC_DIR}/chromiumlib" ) @@ -65,23 +66,6 @@ set(SRC_LIST vogl_vector.cpp vogl_etc.cpp vogl_rg_etc1.cpp - - lzma_7zBuf2.cpp - lzma_7zBuf.cpp - lzma_7zCrc.cpp - lzma_7zFile.cpp - lzma_7zStream.cpp - lzma_Alloc.cpp - lzma_Bcj2.cpp - lzma_Bra86.cpp - lzma_Bra.cpp - lzma_BraIA64.cpp - lzma_LzFind.cpp - # lzma_LzFindMt.cpp - lzma_LzmaDec.cpp - lzma_LzmaEnc.cpp - lzma_LzmaLib.cpp - # lzma_Threads.cpp rmalloc.c regex/debug.c regex/regcomp.c @@ -112,6 +96,8 @@ add_library(${PROJECT_NAME} ${SRC_LIST}) target_link_libraries(${PROJECT_NAME} ${CMAKE_THREAD_LIBS_INIT} rt + ${LZMA_LIBRARIES} + ${LZMADEC_LIBRARIES} ) build_options_finalize() -- 2.43.0