[clfft] 15/109: Fixed bug in clFFT.pc.in where lib directory was set relative to bin directory Added SOVERSION 2 to the clFFT library

[Jérôme Kieffer]

This is an automated email from the git hooks/post-receive script.

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit 0dfdb07abef645402b4b66af73d3fc1f112b4da5
Author: Kent Knox <kent.knox at amd>
Date:   Tue Sep 10 13:20:05 2013 -0500

    Fixed bug in clFFT.pc.in where lib directory was set relative to bin directory
    Added SOVERSION 2 to the clFFT library
---
 src/CMakeLists.txt           | 3 +++
 src/library/CMakeLists.txt   | 1 +
 src/library/clFFT.pc.in      | 2 +-
 src/statTimer/CMakeLists.txt | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 446988a..7f1431d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,9 @@ set( CLFFT_VERSION_MINOR 1 )
 set( CLFFT_VERSION_PATCH 0 )
 set( CLFFT_VERSION "${CLFFT_VERSION_MAJOR}.${CLFFT_VERSION_MINOR}.${CLFFT_VERSION_PATCH}")
 
+# This is incremented when the ABI to the library changes
+set( CLFFT_SOVERSION 2 )
+
 set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR} )
 
 # On windows, it's convenient to change the default install prefix such that it does NOT point to 'program files'
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index 85f2aaa..6a3ea69 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -78,6 +78,7 @@ add_library( clFFT SHARED ${clFFT.Files} )
 target_link_libraries( clFFT ${OPENCL_LIBRARIES} )
 
 set_target_properties( clFFT PROPERTIES VERSION ${CLFFT_VERSION} )
+set_target_properties( clFFT PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
 set_target_properties( clFFT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 
 if( CMAKE_COMPILER_IS_GNUCC )
diff --git a/src/library/clFFT.pc.in b/src/library/clFFT.pc.in
index 21ef20a..63dc0ea 100644
--- a/src/library/clFFT.pc.in
+++ b/src/library/clFFT.pc.in
@@ -1,7 +1,7 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}/bin at SUFFIX_BIN@
 includedir=${prefix}/include
-libdir=${exec_prefix}/lib at SUFFIX_LIB@
+libdir=${prefix}/lib at SUFFIX_LIB@
 
 Name: clFFT
 Description: Open source OpenCL FFT library
diff --git a/src/statTimer/CMakeLists.txt b/src/statTimer/CMakeLists.txt
index c2d55bb..6de01a9 100644
--- a/src/statTimer/CMakeLists.txt
+++ b/src/statTimer/CMakeLists.txt
@@ -65,6 +65,7 @@ include_directories( ${OPENCL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/include ../inc
 
 add_library( StatTimer SHARED ${StatTimer.Files} )
 set_target_properties( StatTimer PROPERTIES VERSION ${CLFFT_VERSION} )
+set_target_properties( StatTimer PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
 set_target_properties( StatTimer PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 target_link_libraries( StatTimer ${OPENCL_LIBRARIES} )
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git