[PATCH] libftdi: fix packagekit when useing cmake

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PATCH] libftdi: fix packagekit when useing cmake

Alexander Couzens
cmake is missing the variable VERSION. VERSION is used in libftdi.pc.in. When other packages
using a min version they fail detecting libftdi.

Signed-off-by: Alexander Couzens <[hidden email]>
---
 .../patches/101-fix-cmake-version-packagekit.patch | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 libs/libftdi/patches/101-fix-cmake-version-packagekit.patch

diff --git a/libs/libftdi/patches/101-fix-cmake-version-packagekit.patch b/libs/libftdi/patches/101-fix-cmake-version-packagekit.patch
new file mode 100644
index 0000000..f2fd731
--- /dev/null
+++ b/libs/libftdi/patches/101-fix-cmake-version-packagekit.patch
@@ -0,0 +1,23 @@
+Index: CMakeLists.txt
+===================================================================
+--- a/CMakeLists.txt 2014-12-22 19:32:27.768281786 +0100
++++ b/CMakeLists.txt 2014-12-22 21:23:44.751158291 +0100
+@@ -79,6 +79,9 @@
+ set(CPACK_SOURCE_IGNORE_FILES          "\\\\.git")
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME     ${CPACK_PACKAGE_FILE_NAME})
+
++set(PACKAGE libftdi)
++set(VERSION ${VERSION_STRING})
++
+ # Subdirectories
+ if(${UNIX})
+   set(CPACK_SET_DESTDIR "ON")
+@@ -100,8 +103,6 @@
+ if(DOCUMENTATION AND DOXYGEN_FOUND)
+
+    # Set variables
+-   set(PACKAGE libftdi)
+-   set(VERSION ${VERSION_STRING})
+    set(top_srcdir ${CMAKE_SOURCE_DIR})
+
+    # Find doxy config
--
2.2.1


--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to [hidden email]  

Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: [PATCH] libftdi: fix packagekit when useing cmake

Thomas Jarosch
Hi Alexander,

On Monday, 22. December 2014 21:48:36 Alexander Couzens wrote:
> cmake is missing the variable VERSION. VERSION is used in libftdi.pc.in.
> When other packages using a min version they fail detecting libftdi.
>
> Signed-off-by: Alexander Couzens <[hidden email]>

thanks for the patch, good catch :) I've committed
something based upon your patch to the libftdi-0.x branch. Read:
This change is needed for libftdi 0.x only, it's already fixed on "master".

Cheers,
Thomas


--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to [hidden email]  

Loading...