mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmake: add LIBGIT2_FROM_PKGCONFIG and LIBDC_FROM_PKGCONFIG

Browse source 
These two new options allow usage of pkg-config to retrieve
libdivecomputer and libgit2.

For some reason the variables *_LIBRARIES have to be set
to blank strings in the process, otherwise "-l" is passed to
the linker.

LIBGIT2_FROM_PKGCONFIG is a rename from PREFER_GIT_FROMSOURCE
for consistency. The IF() check is also fixed.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2015-04-18 00:31:12 +03:00 committed by Dirk Hohndel
parent 39d0b5533d
commit ed4fbb92d0
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -7,7 +7,8 @@ cmake_minimum_required(VERSION 2.8.11)
SET(CMAKE_AUTOMOC ON) SET(CMAKE_AUTOMOC ON)
SET(CMAKE_AUTOUIC ON) SET(CMAKE_AUTOUIC ON)
OPTION(PREFER_GIT_FROMSOURCE "Turn off if you wanna use system's libgit 0.21.5" ON) OPTION(LIBGIT2_FROM_PKGCONFIG "use pkg-config to retrieve libgit2" OFF)
OPTION(LIBDC_FROM_PKGCONFIG "use pkg-config to retrieve libdivecomputer" OFF)
OPTION(NO_MARBLE "disable the marble widget" OFF) OPTION(NO_MARBLE "disable the marble widget" OFF)
OPTION(NO_TESTS "disable the tests" OFF) OPTION(NO_TESTS "disable the tests" OFF)
OPTION(NO_DOCS "disable the docs" OFF) OPTION(NO_DOCS "disable the docs" OFF)
@ -33,15 +34,21 @@ pkg_config_library(LIBUSB libusb-1.0 QUIET)
# more libraries with special handling in case we build them ourselves # more libraries with special handling in case we build them ourselves
if(NOT ${PREFER_GIT_FROMSOURCE}) IF(LIBGIT2_FROM_PKGCONFIG)
pkg_config_library(LIBGIT2 libgit2 REQUIRED) pkg_config_library(LIBGIT2 libgit2 REQUIRED)
SET(LIBGIT2_LIBRARIES "")
ELSE() ELSE()
FIND_PACKAGE(LIBGIT2 REQUIRED) FIND_PACKAGE(LIBGIT2 REQUIRED)
INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBGIT2_INCLUDE_DIR})
ENDIF() ENDIF()
FIND_PACKAGE(Libdivecomputer REQUIRED) IF(LIBDC_FROM_PKGCONFIG)
INCLUDE_DIRECTORIES(${LIBDIVECOMPUTER_INCLUDE_DIR}) pkg_config_library(LIBDC libdivecomputer REQUIRED)
SET(LIBDIVECOMPUTER_LIBRARIES "")
ELSE()
FIND_PACKAGE(Libdivecomputer REQUIRED)
INCLUDE_DIRECTORIES(${LIBDIVECOMPUTER_INCLUDE_DIR})
ENDIF()
# optional marble # optional marble