[asl] 159/177: Fix cyclic dependency issue

[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 0c03aee119148b74976b1af3c3ae8e9744c11a39
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Sun Aug 16 12:04:23 2015 +0300

    Fix cyclic dependency issue
---
 src/CMakeLists.txt           |  4 +++-
 src/acl/CMakeLists.txt       |  2 +-
 src/acl/aclTypes.h           |  2 +-
 src/acl/aclTypesList.h       |  3 +--
 src/acl/aclUtilities.cxx     |  2 +-
 src/acl/aclUtilities.h       |  4 +---
 src/aslUtilities.cxx         | 19 ++++++++++++-------
 src/numExtend/CMakeLists.txt |  2 +-
 8 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a068269..b916a00 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,7 +101,9 @@ set(aslvtk_SOURCES
 )
 
 add_library(aslvtk ${aslvtk_PUBLIC_HEADERS} ${aslvtk_SOURCES})
-target_link_libraries(aslvtk PRIVATE aslacl ${VTK_LIBRARIES} ${OpenCL_LIBRARIES})
+target_link_libraries(aslvtk PRIVATE aslacl asl
+	${VTK_LIBRARIES} ${OpenCL_LIBRARIES}
+	${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
 INSTALL_SUBLIB(aslvtk aslvtk_PUBLIC_HEADERS)
 
 
diff --git a/src/acl/CMakeLists.txt b/src/acl/CMakeLists.txt
index 859cced..6753d1f 100644
--- a/src/acl/CMakeLists.txt
+++ b/src/acl/CMakeLists.txt
@@ -60,4 +60,4 @@ set(aslacl_SOURCES
 
 add_library(aslacl ${aslacl_PUBLIC_HEADERS} ${aslacl_SOURCES})
 target_link_libraries(aslacl PUBLIC aslcommon ${OpenCL_LIBRARIES})
-INSTALL_SUBLIB(aslacl aslacl_PUBLIC_HEADERS)
+INSTALL_SUBLIB(aslacl aslacl_PUBLIC_HEADERS)
\ No newline at end of file
diff --git a/src/acl/aclTypes.h b/src/acl/aclTypes.h
index cc2e256..cdfc824 100644
--- a/src/acl/aclTypes.h
+++ b/src/acl/aclTypes.h
@@ -45,4 +45,4 @@ namespace acl
 	};
 }
 
-#endif // ACLTYPES_H
+#endif // ACLTYPES_H
\ No newline at end of file
diff --git a/src/acl/aclTypesList.h b/src/acl/aclTypesList.h
index 83ee4bc..6a0fdb2 100644
--- a/src/acl/aclTypesList.h
+++ b/src/acl/aclTypesList.h
@@ -33,5 +33,4 @@
 
 #define BOOST_TT_acl_types (cl_int)(cl_uint)(cl_float)(cl_double)(cl_long)
 
-
-#endif // ACLTYPESLIST_H
+#endif // ACLTYPESLIST_H
\ No newline at end of file
diff --git a/src/acl/aclUtilities.cxx b/src/acl/aclUtilities.cxx
index 1dfb9be..7b3981a 100644
--- a/src/acl/aclUtilities.cxx
+++ b/src/acl/aclUtilities.cxx
@@ -148,4 +148,4 @@ namespace acl
 	#undef BOOST_TT_rep_expression
 
 	
-} // namespace acl
+} // namespace acl
\ No newline at end of file
diff --git a/src/acl/aclUtilities.h b/src/acl/aclUtilities.h
index 11ed956..3b49681 100644
--- a/src/acl/aclUtilities.h
+++ b/src/acl/aclUtilities.h
@@ -36,7 +36,6 @@ namespace cl
 
 namespace acl
 {
-	
 	extern const std::string INDEX;
 	extern const KernelConfiguration KERNEL_BASIC;
 
@@ -63,7 +62,6 @@ namespace acl
 	                          unsigned int typeSize,
 	                          CommandQueue queue);
 
-
 	/// Adds padding in elements based on vector width
 	unsigned int paddingElements(unsigned int size,
 	                             const KernelConfiguration & kernelConfig);
@@ -129,4 +127,4 @@ namespace acl
 	
 	
 } // namespace acl
-#endif // ACLUTILITIES_H
+#endif // ACLUTILITIES_H
\ No newline at end of file
diff --git a/src/aslUtilities.cxx b/src/aslUtilities.cxx
index d0aa967..846930c 100644
--- a/src/aslUtilities.cxx
+++ b/src/aslUtilities.cxx
@@ -20,9 +20,10 @@
  *
  */
 
+
 #include <stdexcept>
 #include "aslUtilities.h"
-#include "acl/aclUtilities.h"
+
 
 using namespace std;
 
@@ -33,22 +34,26 @@ namespace asl
 	{
 		istringstream i(s);
 		T x;
-		int decimal(0);
 		char c;
 
 		if (!(i >> x))
-			errorMessage("strToNum() - unable to convert " + s + " to " + acl::typeToStr<T>());
+			errorMessage("strToNum() - unable to convert " + s + " to the requested type");
 
 		if (i.get(c))
-			warningMessage("strToNum() - " + s + " contains character");
- 
+			warningMessage("strToNum() - " + s + " contains a character");
+
+/*
+		ToDo: check whether it is needed at all.
+		Commented out since it causes cyclic dependency aslcommon <-> aslacl through "aclUtilites.h"
+
+		int decimal(0);
 		if (acl::typeToTypeID<T>() == acl::TYPE_INT)
 		{
 			i >> decimal;
 			if (decimal != 0)
 				warningMessage("strToNum() - " + s + " is not an integer");
 		}
-
+*/
 		return x;
 	}
 
@@ -116,4 +121,4 @@ namespace asl
 		return string("ASL WARNING: ") + warningMessage + ".";
 	}
 
-} // asl namespace
+} // asl namespace
\ No newline at end of file
diff --git a/src/numExtend/CMakeLists.txt b/src/numExtend/CMakeLists.txt
index 15e0cec..0a19ddd 100644
--- a/src/numExtend/CMakeLists.txt
+++ b/src/numExtend/CMakeLists.txt
@@ -33,5 +33,5 @@ set(aslnumext_SOURCES
 )
 
 add_library(aslnumext ${aslnumext_PUBLIC_HEADERS} ${aslnumext_SOURCES})
-target_link_libraries(aslnumext PRIVATE asl aslacl aslcommon ${OpenCL_LIBRARIES})
+target_link_libraries(aslnumext PRIVATE aslnum 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