X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=src%2Fvoglcore%2FCMakeLists.txt;h=8e4bd658c7998b8690e12e2949f6eaae9f0a8112;hb=42805b65aa22d66be676e4eea3d0adc5a7a8fefc;hp=9dd0f5067048bb910df5bde3445f931b89520f44;hpb=8718f75fe1ab2bdbb208a6471499063be903dddb;p=vogl diff --git a/src/voglcore/CMakeLists.txt b/src/voglcore/CMakeLists.txt index 9dd0f50..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 @@ -105,7 +93,12 @@ else() endif() add_library(${PROJECT_NAME} ${SRC_LIST}) -target_link_libraries(${PROJECT_NAME} rt) +target_link_libraries(${PROJECT_NAME} + ${CMAKE_THREAD_LIBS_INIT} + rt + ${LZMA_LIBRARIES} + ${LZMADEC_LIBRARIES} + ) build_options_finalize()