Skip to content

Commit

Permalink
dev-embedded/libftdi: Fix version in pkg-config file with USE=-doc
Browse files Browse the repository at this point in the history
Signed-off-by: Sven Wegener <[email protected]>
  • Loading branch information
swegener committed Dec 19, 2015
1 parent d8344da commit 62e0925
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
38 changes: 38 additions & 0 deletions dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From e18b700743217e8c505e97762e0f66a4f6a90425 Mon Sep 17 00:00:00 2001
From: Maciej Grela <[email protected]>
Date: Wed, 20 Jun 2012 23:08:50 +0200
Subject: [PATCH] Fix libftdi.pc file generation when building with
-DDOCUMENTATION=OFF

---
CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c43a48..07f8bb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,9 @@
project(libftdi)
set(MAJOR_VERSION 0)
set(MINOR_VERSION 20)
+set(PACKAGE libftdi)
set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
+set(VERSION ${VERSION_STRING})
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")

# CMake
@@ -116,12 +118,11 @@ add_custom_target(dist

option(DOCUMENTATION "Generate API documentation with Doxygen" ON)

+
find_package(Doxygen)
if(DOCUMENTATION AND DOXYGEN_FOUND)

# Set variables
- set(PACKAGE libftdi)
- set(VERSION ${VERSION_STRING})
set(top_srcdir ${CMAKE_SOURCE_DIR})

# Find doxy config
2 changes: 1 addition & 1 deletion dev-embedded/libftdi/libftdi-0.20.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ src_prepare() {
-e '/SET(LIB_SUFFIX /d' \
CMakeLists.txt || die

epatch "${FILESDIR}"/${P}-cmake-include.patch
epatch "${FILESDIR}"/${P}-cmake-{include,version}.patch
}

src_configure() {
Expand Down

0 comments on commit 62e0925

Please sign in to comment.