[clfft] 11/109: Merging Matzes pull request, with modifications for the new install procedure

[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 6d37dbad3ca4ed1e561be36bc2a3e2588387c24b
Author: Kent Knox <kent.knox at amd>
Date:   Wed Sep 4 09:15:36 2013 -0500

    Merging Matzes pull request, with modifications for the new install procedure
---
 src/library/CMakeLists.txt | 10 +++-------
 src/library/clFFT.pc.in    |  9 +++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index bab71d3..85f2aaa 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -80,16 +80,12 @@ target_link_libraries( clFFT ${OPENCL_LIBRARIES} )
 set_target_properties( clFFT PROPERTIES VERSION ${CLFFT_VERSION} )
 set_target_properties( clFFT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 
-if( UNIX )
-	# Right now, linux has problems compiling dynamic_cast, but the flag below doesn't help
-	# set_target_properties( clFFT PROPERTIES COMPILE_FLAGS "-frtti" )
-
+if( CMAKE_COMPILER_IS_GNUCC )
     configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in
-                    ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY IMMEDIATE )
+                    ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY )
 
     install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc
-             DESTINATION lib/pkgconfig
-           )
+             DESTINATION lib${SUFFIX_LIB}/pkgconfig )
 endif( )
 
 # CPack configuration; include the executable into the package
diff --git a/src/library/clFFT.pc.in b/src/library/clFFT.pc.in
index 85cd882..21ef20a 100644
--- a/src/library/clFFT.pc.in
+++ b/src/library/clFFT.pc.in
@@ -1,11 +1,12 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+exec_prefix=${prefix}/bin at SUFFIX_BIN@
 includedir=${prefix}/include
+libdir=${exec_prefix}/lib at SUFFIX_LIB@
 
 Name: clFFT
-Description: OpenCL FFT library
+Description: Open source OpenCL FFT library
 Version: @CLFFT_VERSION@
+URL: https://github.com/clMathLibraries/clFFT
 
-Libs: -L${libdir} -lclFFT
 Cflags: -I${includedir}
+Libs: -L${libdir} -lclFFT

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