X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fvoglcore%2FCMakeLists.txt;h=8e4bd658c7998b8690e12e2949f6eaae9f0a8112;hb=23077d119b32a6ee9d1e012ed87ef39b732f16b0;hp=9b6dda144666f4cbc24ed99681a2b4c14bf949d4;hpb=5dfa02621fbdbae34adfd4e25faad0268f6a198a;p=vogl diff --git a/src/voglcore/CMakeLists.txt b/src/voglcore/CMakeLists.txt index 9b6dda1..8e4bd65 100644 --- a/src/voglcore/CMakeLists.txt +++ b/src/voglcore/CMakeLists.txt @@ -2,11 +2,16 @@ project(voglcore) cmake_minimum_required(VERSION 2.8) option(VOGL_ENABLE_ASSERTS "Enable assertions in all builds (including release)" FALSE) +find_package(Threads) +if (NOT CMAKE_USE_PTHREADS_INIT) + message(ERROR "pthread not found") +endif () include("${SRC_DIR}/build_options.cmake") include_directories( - "${PROJECT_SOURCE_DIR}/../inc" + ${LZMA_INCLUDE_DIR} + ${LZMADEC_INCLUDE_DIR} "${SRC_DIR}/chromiumlib" ) @@ -61,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 @@ -106,8 +94,10 @@ endif() add_library(${PROJECT_NAME} ${SRC_LIST}) target_link_libraries(${PROJECT_NAME} - pthread + ${CMAKE_THREAD_LIBS_INIT} rt + ${LZMA_LIBRARIES} + ${LZMADEC_LIBRARIES} ) build_options_finalize()