From 46990f4ac8840c26a5fda09b28b7b057f9b0e3b0 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 7 Apr 2015 17:38:08 -0300 Subject: Simplify libgit handling on main CMakeLists.txt We will use the OPTIONS variable to decide to find the .a or the .so, so there's no need to do checks here. Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f22091fcb..329a5e19b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,13 +34,8 @@ pkg_config_library(LIBZIP libzip) if(NOT ${PREFER_GIT_FROMSOURCE}) pkg_config_library(LIBGIT2 libgit2) ELSE() - include_directories(${LIBGIT2DEVEL}/include) - link_directories(${LIBGIT2DEVEL}/build) - if(NOT DEFINED LIBGIT2STATIC) - set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -lgit2 -lssl -lcrypto) - ELSE() - set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} libgit2.a -lssl -lcrypto) - ENDIF() + FIND_PACKAGE(LIBGIT2 REQUIRED) + INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDE_DIRS}) ENDIF() SET(LIBDCDEVEL "" CACHE STRING "libraries") -- cgit v1.2.3-70-g09d2