[asl] 148/177: Fixing minor linkage issues

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository asl.

commit bc7c9b1e9637022543ec057ee9de4fb55d0705da
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Thu Aug 13 13:04:21 2015 +0300

    Fixing minor linkage issues
---
 src/CMakeLists.txt           | 11 ++++-------
 src/num/CMakeLists.txt       |  6 ++----
 src/numExtend/CMakeLists.txt |  3 +--
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb140e7..38c8ae0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,13 +20,12 @@ set(aslcommon_PUBLIC_HEADERS
 )
 
 set(aslcommon_SOURCES
-	${aslcommon_PUBLIC_HEADERS}
 	utilities/aslTimeStamp.cxx
 	aslUtilities.cxx
 )
 
-add_library(aslcommon ${aslcommon_SOURCES})
-target_link_libraries(aslcommon PRIVATE ${Boost_LIBRARIES} ${OpenCL_LIBRARIES})
+add_library(aslcommon ${aslcommon_PUBLIC_HEADERS} ${aslcommon_SOURCES})
+target_link_libraries(aslcommon PRIVATE ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslcommon aslcommon_PUBLIC_HEADERS)
 
 
@@ -73,14 +72,13 @@ set(aslvtk_PUBLIC_HEADERS
 )
 
 set(aslvtk_SOURCES
-	${aslvtk_PUBLIC_HEADERS}
 	utilities/aslVTKCasters.cxx
 	utilities/aslVTKDataGenerators.cxx
 	writers/aslVTKFormatWriters.cxx
 	readers/aslVTKFormatReaders.cxx
 )
 
-add_library(aslvtk ${aslvtk_SOURCES})
+add_library(aslvtk ${aslvtk_PUBLIC_HEADERS} ${aslvtk_SOURCES})
 target_link_libraries(aslvtk PRIVATE aslacl ${VTK_LIBRARIES} ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslvtk aslvtk_PUBLIC_HEADERS)
 
@@ -97,12 +95,11 @@ if (WITH_MATIO)
 	)
 
 	set(aslmatio_SOURCES
-		${aslmatio_PUBLIC_HEADERS}
 		utilities/aslMATLABCasters.cxx
 		writers/aslMATFormat.cxx
 	)
 
-	add_library(aslmatio ${aslmatio_SOURCES})
+	add_library(aslmatio ${aslmatio_PUBLIC_HEADERS} ${aslmatio_SOURCES})
 	target_link_libraries(aslmatio PRIVATE aslacl ${MATIO_LIBRARIES} ${OpenCL_LIBRARIES})
 	INSTALL_SUBLIB(aslmatio aslmatio_PUBLIC_HEADERS)
 endif (WITH_MATIO)
\ No newline at end of file
diff --git a/src/num/CMakeLists.txt b/src/num/CMakeLists.txt
index e5b874e..414af26 100644
--- a/src/num/CMakeLists.txt
+++ b/src/num/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/acl)
 
 
@@ -36,7 +35,6 @@ set(aslnum_PUBLIC_HEADERS
 )
 
 set(aslnum_SOURCES
-	${aslnum_PUBLIC_HEADERS}
 	aslNumMethod.cxx
 	aslSingleKernelNM.cxx
 	aslFDAdvectionDiffusion.cxx
@@ -67,6 +65,6 @@ set(aslnum_SOURCES
 	aslDataResampling.cxx
 )
 
-add_library(aslnum ${aslnum_SOURCES})
-target_link_libraries(aslnum PRIVATE ${OpenCL_LIBRARIES} aslacl aslcommon asl)
+add_library(aslnum ${aslnum_PUBLIC_HEADERS} ${aslnum_SOURCES})
+target_link_libraries(aslnum PRIVATE asl aslacl aslcommon ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslnum aslnum_PUBLIC_HEADERS)
\ No newline at end of file
diff --git a/src/numExtend/CMakeLists.txt b/src/numExtend/CMakeLists.txt
index 3271071..d1ef2bf 100644
--- a/src/numExtend/CMakeLists.txt
+++ b/src/numExtend/CMakeLists.txt
@@ -7,10 +7,9 @@ set(aslnumext_PUBLIC_HEADERS
 )
 
 set(aslnumext_SOURCES
-	${aslnumext_PUBLIC_HEADERS}
 	aslFDAdvectionDiffusionExtended.cxx
 )
 
-add_library(aslnumext ${aslnumext_SOURCES})
+add_library(aslnumext ${aslnumext_PUBLIC_HEADERS} ${aslnumext_SOURCES})
 target_link_libraries(aslnumext PRIVATE asl aslacl aslcommon ${OpenCL_LIBRARIES})
 INSTALL_SUBLIB(aslnumext aslnumext_PUBLIC_HEADERS)

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