[asl] 67/177: Fixing pkgconfig
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository asl.
commit 27671de9f99081c2e57447a8af5b96e934757bd7
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date: Sun Jul 5 15:59:24 2015 +0300
Fixing pkgconfig
---
CMakeLists.txt | 4 ++--
cmake/ASL.pc.cmake.in | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfab8f6..4a78bbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,10 +12,10 @@ set(ASL_VERSION_PATCH 4)
set(ASL_VERSION ${ASL_VERSION_MAJOR}.${ASL_VERSION_MINOR}.${ASL_VERSION_PATCH})
if (CMAKE_VERSION VERSION_LESS 3.1.0)
- set(CMAKE_CXX_FLAGS "-fpermissive -std=c++11 ${CMAKE_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -std=c++11")
else()
set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_FLAGS "-fpermissive ${CMAKE_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
endif()
# Enable supplied cmake includes and modules
diff --git a/cmake/ASL.pc.cmake.in b/cmake/ASL.pc.cmake.in
index 0be1430..aeeb919 100644
--- a/cmake/ASL.pc.cmake.in
+++ b/cmake/ASL.pc.cmake.in
@@ -4,8 +4,8 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/asl
Name: @PROJECT_NAME@
-Desription: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
+Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
URL: http://asl.org.il
Version: @ASL_VERSION@
-Libs: -L${libdir}@ASL_SUBLIBS@
-Cflags: -I${includedir}
\ No newline at end of file
+Libs: -L${libdir}@ASL_SUBLIBS@ @OpenCL_LIBRARIES@
+Cflags: -I${includedir} @CMAKE_CXX_FLAGS@
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git
More information about the debian-science-commits
mailing list