From 64aa56559d052f746f2b87cb15e8b0e51260daaf Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Wed, 30 May 2018 21:59:06 -0300 Subject: [PATCH] Remove fc bz2 unused linkage --- CMakeLists.txt | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 318b2bd..107b805 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,15 +366,6 @@ else() set( ZLIB_LIBRARIES "" ) endif( ZLIB_FOUND ) -find_package( BZip2 ) -if( BZIP2_FOUND ) - MESSAGE( STATUS "bzip2 found" ) - add_definitions( -DHAS_BZIP2 ) -else() - MESSAGE( STATUS "bzip2 not found" ) - set( BZIP2_LIBRARIES "" ) -endif( BZIP2_FOUND ) - # This will become unnecessary once we update to websocketpp which fixes upstream issue #395 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBSOCKETPP_STRICT_MASKING") @@ -405,11 +396,10 @@ target_include_directories(fc ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp ) -#target_link_libraries( fc PUBLIC ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} ) IF(NOT WIN32) set(LINK_USR_LOCAL_LIB -L/usr/local/lib) ENDIF() -target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${editline_libraries} ${ECC_LIB} ) +target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${editline_libraries} ${ECC_LIB} ) if(MSVC) set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )