[asl] 74/177: Fixing cmake

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 9cd7e45599067a6676813c835f071081867df2e4
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Tue Jul 7 15:07:10 2015 +0300

    Fixing cmake
---
 CMakeLists.txt                   | 13 ++++++++-----
 README.md                        | 10 ++++++++--
 cmake/ASLConfig.cmake.in         |  1 -
 src/CMakeLists.txt               |  9 ++++-----
 src/acl/CMakeLists.txt           |  2 +-
 src/acl/Operators/CMakeLists.txt |  2 +-
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a78bbc..a42a93d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,22 +48,26 @@ set(CPACK_PACKAGE_VERSION_MINOR ${ASL_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${ASL_VERSION_PATCH})
 set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_PACKAGE_DESCRIPTION "Advanced Simulation Library (ASL) is a free and open source multiphysics simulation software package. Its computational engine is based, among others, on the Lattice Boltzmann Methods and is written in OpenCL which enable extraordinarily efficient deployment on a variety of massively parallel architectures, ranging from inexpensive FPGAs, DSPs and GPUs up to heterogeneous clusters and supercomputers. The engine is hidden entirely behind C++ classes, so that [...]
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Advanced Simulation Library is a free and open source OpenCL-based multiphysics simulation software package.")
+set(CPACK_PACKAGE_DESCRIPTION "Advanced Simulation Library (ASL) is a free and open source multiphysics simulation software package. Its computational engine is based, among others, on the Lattice Boltzmann Methods and is written in OpenCL which enable extraordinarily efficient deployment on a variety of massively parallel architectures, ranging from inexpensive FPGAs, DSPs and GPUs up to heterogeneous clusters and supercomputers. The engine is hidden entirely behind C++ classes, so that [...]
 set(CPACK_PACKAGE_VENDOR "Avtech Scientific")
 set(CPACK_PACKAGE_CONTACT "http://avtechscientific.com/contact")
 
-# .deb-specific
+## .deb-specific
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://asl.org.il")
+set(CPACK_DEBIAN_PACKAGE_SECTION "science")
+set(CPACK_DEBIAN_PACKAGE_SUGGESTS "paraview")
+set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}\n${CPACK_PACKAGE_DESCRIPTION}")
 
-# .rpm-specific
+## .rpm-specific
 set(CPACK_RPM_PACKAGE_URL "http://asl.org.il")
 
-# NSIS-specific
+## NSIS-specific
 set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\asl.org.il")
 
 include(CPack)
 
+
 # Config (after package definitions, because CPACK_PACKAGE_DESCRIPTION_SUMMARY
 # is used for pkgconfig.
 
@@ -90,7 +94,6 @@ configure_package_config_file(
 	${CMAKE_SOURCE_DIR}/cmake/ASLConfig.cmake.in
 	${CMAKE_CURRENT_BINARY_DIR}/ASLConfig.cmake
 	INSTALL_DESTINATION ${ConfigPackageLocation}
-	PATH_VARS CMAKE_INSTALL_INCLUDEDIR
 )
 
 install(EXPORT ASLTargets
diff --git a/README.md b/README.md
index f0472c8..2f2acd9 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,14 @@ ASL is distributed under the free GNU Affero General Public License (AGPLv3) wit
 
 1. Take a look on examples, start with [examples/flow/locomotive_in_tunnel.cc](http://asl.org.il/doc/Developer-Guide/locomotive_in_tunnel_8cc-example.html)
 2. ASL installation supplies `ASLConfig.cmake` and `ASL.pc` files. To build your program using
-	- `cmake`: `examples/flow/CMakeLists.txt`
-	- `pkg-config`: `c++ ``pkg-config --cflags --libs ASL`` -o flow flow.cc`
+	- `cmake`: write a basic `CMakeLists.txt`
+		project(locomotive)
+		cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+		find_package(ASL 0.1.4 CONFIG REQUIRED)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -std=c++11")
+		add_executable(locomotive_in_tunnel locomotive_in_tunnel.cc)
+		target_link_libraries(locomotive_in_tunnel PRIVATE ASL::aslnum ASL::aslvtk ASL::asl)
+	- `pkg-config`: ``c++ `pkg-config --cflags --libs ASL` -o locomotive_in_tunnel locomotive_in_tunnel.cc``
 
 
 ## Further information
diff --git a/cmake/ASLConfig.cmake.in b/cmake/ASLConfig.cmake.in
index d393612..cbea49e 100644
--- a/cmake/ASLConfig.cmake.in
+++ b/cmake/ASLConfig.cmake.in
@@ -2,5 +2,4 @@ set(ASL_VERSION "@ASL_VERSION@")
 
 @PACKAGE_INIT@
 include("${CMAKE_CURRENT_LIST_DIR}/ASLTargets.cmake")
-
 check_required_components(ASL)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e3a8ea8..0c8d1a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,7 @@ set(aslCommon_SOURCES
 )
 
 add_library(aslCommon ${aslCommon_SOURCES})
-target_link_libraries(aslCommon ${Boost_LIBRARIES})
+target_link_libraries(aslCommon PRIVATE ${Boost_LIBRARIES})
 INSTALL_SUBLIB(aslCommon aslCommon_PUBLIC_HEADERS)
 
 
@@ -55,7 +55,7 @@ set(asl_SOURCES
 )
 
 add_library(asl ${asl_SOURCES})
-target_link_libraries(asl aslCommon aslacl asldata aslmath ${Boost_LIBRARIES})
+target_link_libraries(asl PUBLIC aslCommon aslacl asldata aslmath ${Boost_LIBRARIES})
 INSTALL_SUBLIB(asl asl_PUBLIC_HEADERS)
 
 
@@ -77,7 +77,7 @@ set(aslvtk_SOURCES
 )
 
 add_library(aslvtk ${aslvtk_SOURCES})
-target_link_libraries(aslvtk ${VTK_LIBRARIES} ${OpenCL_LIBRARIES})
+target_link_libraries(aslvtk PRIVATE ${VTK_LIBRARIES} PRIVATE ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslvtk aslvtk_PUBLIC_HEADERS)
 
 
@@ -86,7 +86,6 @@ INSTALL_SUBLIB(aslvtk aslvtk_PUBLIC_HEADERS)
 if (WITH_MATIO)
 	find_package(MATIO 1.5.2 REQUIRED)
 	include_directories(SYSTEM ${MATIO_INCLUDE_DIRS})
-	set(CMAKE_CXX_FLAGS "-fpermissive ${CMAKE_CXX_FLAGS}")
 
 	set(aslmatio_PUBLIC_HEADERS
 		utilities/aslMATLABCasters.h
@@ -100,7 +99,7 @@ if (WITH_MATIO)
 	)
 
 	add_library(aslmatio ${aslmatio_SOURCES})
-	target_link_libraries(aslmatio ${MATIO_LIBRARIES})
+	target_link_libraries(aslmatio PRIVATE ${MATIO_LIBRARIES})
 	INSTALL_SUBLIB(aslmatio aslmatio_PUBLIC_HEADERS)
 endif (WITH_MATIO)
 
diff --git a/src/acl/CMakeLists.txt b/src/acl/CMakeLists.txt
index 33b0b60..e1f5403 100644
--- a/src/acl/CMakeLists.txt
+++ b/src/acl/CMakeLists.txt
@@ -63,5 +63,5 @@ set(aslacl_SOURCES
 )
 
 add_library(aslacl ${aslacl_SOURCES})
-target_link_libraries(aslacl aslCommon aslaclOperators aslaclMath ${OpenCL_LIBRARIES})
+target_link_libraries(aslacl PUBLIC aslCommon aslaclOperators aslaclMath ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslacl aslacl_PUBLIC_HEADERS)
diff --git a/src/acl/Operators/CMakeLists.txt b/src/acl/Operators/CMakeLists.txt
index 0154013..f634ccd 100644
--- a/src/acl/Operators/CMakeLists.txt
+++ b/src/acl/Operators/CMakeLists.txt
@@ -57,5 +57,5 @@ set(aslaclOperators_SOURCES
 )
 
 add_library(aslaclOperators ${aslaclOperators_SOURCES})
-target_link_libraries(aslaclOperators ${OpenCL_LIBRARIES})
+target_link_libraries(aslaclOperators PRIVATE ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslaclOperators aslaclOperators_PUBLIC_HEADERS)

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

