From 56de93c8c794e0e7f4d3acfc5f6817fe5f011470 Mon Sep 17 00:00:00 2001 From: Jan Winkler Date: Thu, 19 Jul 2012 16:51:03 +0200 Subject: [PATCH] Commented out iberty_library stuff The iberty_library could not be found anywhere in my repos or on my system. Compiles and runs fine without. --- CMakeLists.txt | 3 +++ libgrive/CMakeLists.txt | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca39cb1..c2137ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.8) # Grive version. remember to update it for every new release! set( GRIVE_VERSION "0.2.0" ) +# Actually find the boost libraries +find_package( Boost ) + # common compile options add_definitions( -DVERSION="${GRIVE_VERSION}" ) add_definitions( -D_FILE_OFFSET_BITS=64 ) diff --git a/libgrive/CMakeLists.txt b/libgrive/CMakeLists.txt index a19fc99..748f388 100644 --- a/libgrive/CMakeLists.txt +++ b/libgrive/CMakeLists.txt @@ -27,9 +27,10 @@ if ( BFD_FOUND ) endif ( BFD_FOUND ) -if ( IBERTY_FOUND ) - set( OPT_LIBS ${OPT_LIBS} ${IBERTY_LIBRARY} ) -endif ( IBERTY_FOUND ) +# Not found on my system or in any standard repos. +#if ( IBERTY_FOUND ) +# set( OPT_LIBS ${OPT_LIBS} ${IBERTY_LIBRARY} ) +#endif ( IBERTY_FOUND ) if ( ZLIB_FOUND ) set( OPT_LIBS ${OPT_LIBS} ${ZLIB_LIBRARIES} ) @@ -81,7 +82,7 @@ target_link_libraries( grive ${LIBGCRYPT_LIBRARIES} ${GDBM_LIBRARIES} ${Boost_LIBRARIES} - ${IBERTY_LIBRARY} + #${IBERTY_LIBRARY} ${EXPAT_LIBRARY} ${OPT_LIBS} )