[asl] 146/177: Fixing linkage issues
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Aug 27 09:22:49 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 b0c1693f27bf73d1501ce05038e5eefb335d5885
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date: Thu Aug 13 12:01:16 2015 +0300
Fixing linkage issues
---
cmake/ASL.pc.cmake.in | 3 ++
src/CMakeLists.txt | 30 ++++++++++--------
src/acl/CMakeLists.txt | 59 ++++++++++------------------------
src/acl/DataTypes/acldatatypes.cmake | 33 +++++++++++++++++++
src/acl/Kernels/aclkernels.cmake | 17 ++++++++++
src/acl/Operators/CMakeLists.txt | 61 ------------------------------------
src/acl/Operators/acloperators.cmake | 53 +++++++++++++++++++++++++++++++
src/acl/aclMath/CMakeLists.txt | 30 ------------------
src/acl/aclMath/aclmath.cmake | 24 ++++++++++++++
src/aslGenerators.h | 6 ++--
src/aslGeomInc.h | 6 ++--
src/data/CMakeLists.txt | 26 ---------------
src/data/asldata.cmake | 19 +++++++++++
src/math/CMakeLists.txt | 41 ------------------------
src/math/aslmath.cmake | 33 +++++++++++++++++++
src/num/CMakeLists.txt | 4 +--
src/numExtend/CMakeLists.txt | 3 +-
test/testABD/CMakeLists.txt | 2 +-
test/testACL/CMakeLists.txt | 2 +-
test/testMath/CMakeLists.txt | 4 +--
20 files changed, 229 insertions(+), 227 deletions(-)
diff --git a/cmake/ASL.pc.cmake.in b/cmake/ASL.pc.cmake.in
index 11fa955..9d18fe2 100644
--- a/cmake/ASL.pc.cmake.in
+++ b/cmake/ASL.pc.cmake.in
@@ -7,5 +7,8 @@ Name: @PROJECT_NAME@
Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
URL: http://asl.org.il
Version: @ASL_VERSION@
+# It should probably be like this:
+# Libs.private: @OpenCL_LIBRARIES@
+# Libs: -L${libdir}@ASL_SUBLIBS@
Libs: -L${libdir}@ASL_SUBLIBS@ @OpenCL_LIBRARIES@
Cflags: -I${includedir}
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c12dab..bb140e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,10 +3,11 @@
# to the _SOURCES (or _PRIVATE_HEADERS?)
add_subdirectory(acl)
-add_subdirectory(data)
-add_subdirectory(math)
add_subdirectory(num)
add_subdirectory(numExtend)
+
+include(data/asldata.cmake)
+include(math/aslmath.cmake)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/acl)
@@ -14,27 +15,28 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/acl)
# aslcommon
set(aslcommon_PUBLIC_HEADERS
- utilities/aslParametersManager.h
utilities/aslTimeStamp.h
aslUtilities.h
)
set(aslcommon_SOURCES
${aslcommon_PUBLIC_HEADERS}
- utilities/aslParametersManager.cxx
utilities/aslTimeStamp.cxx
aslUtilities.cxx
)
add_library(aslcommon ${aslcommon_SOURCES})
-target_link_libraries(aslcommon PRIVATE ${Boost_LIBRARIES})
+target_link_libraries(aslcommon PRIVATE ${Boost_LIBRARIES} ${OpenCL_LIBRARIES})
INSTALL_SUBLIB(aslcommon aslcommon_PUBLIC_HEADERS)
# asl
-set(asl_PUBLIC_HEADERS
- aslGenerators.h
+set(asl_PUBLIC_HEADERS
+ ${asldata_PUBLIC_HEADERS}
+ ${aslmath_PUBLIC_HEADERS}
+ aslGenerators.h
+ utilities/aslParametersManager.h
utilities/aslTimer.h
utilities/aslUValue.h
utilities/aslGlobalSpace.h
@@ -46,16 +48,18 @@ set(asl_PUBLIC_HEADERS
)
set(asl_SOURCES
- ${asl_PUBLIC_HEADERS}
- aslGenerators.cxx
+ ${asldata_SOURCES}
+ ${aslmath_SOURCES}
+ aslGenerators.cxx
+ utilities/aslParametersManager.cxx
writers/aslABDFormat.cxx
writers/aslWriter.cxx
aslDataInc.cxx
aslGeomInc.cxx
)
-add_library(asl ${asl_SOURCES})
-target_link_libraries(asl PUBLIC aslcommon aslacl asldata aslmath PRIVATE ${Boost_LIBRARIES})
+add_library(asl ${asl_PUBLIC_HEADERS} ${asl_SOURCES})
+target_link_libraries(asl PUBLIC aslcommon aslacl PRIVATE ${Boost_LIBRARIES})
INSTALL_SUBLIB(asl asl_PUBLIC_HEADERS)
@@ -77,7 +81,7 @@ set(aslvtk_SOURCES
)
add_library(aslvtk ${aslvtk_SOURCES})
-target_link_libraries(aslvtk PRIVATE ${VTK_LIBRARIES} PRIVATE ${OpenCL_LIBRARIES})
+target_link_libraries(aslvtk PRIVATE aslacl ${VTK_LIBRARIES} ${OpenCL_LIBRARIES})
INSTALL_SUBLIB(aslvtk aslvtk_PUBLIC_HEADERS)
@@ -99,6 +103,6 @@ if (WITH_MATIO)
)
add_library(aslmatio ${aslmatio_SOURCES})
- target_link_libraries(aslmatio PRIVATE ${MATIO_LIBRARIES})
+ 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/acl/CMakeLists.txt b/src/acl/CMakeLists.txt
index 77fa291..d022959 100644
--- a/src/acl/CMakeLists.txt
+++ b/src/acl/CMakeLists.txt
@@ -1,67 +1,40 @@
-add_subdirectory(Operators)
-add_subdirectory(aclMath)
+include(Operators/acloperators.cmake)
+include(aclMath/aclmath.cmake)
+include(DataTypes/acldatatypes.cmake)
+include(Kernels/aclkernels.cmake)
include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/acl)
# aslacl
-set(aslacl_PUBLIC_HEADERS
+set(aslacl_PUBLIC_HEADERS
+ ${acloperators_PUBLIC_HEADERS}
+ ${aclmath_PUBLIC_HEADERS}
+ ${acldatatypes_PUBLIC_HEADERS}
+ ${aclkernels_PUBLIC_HEADERS}
aclStdIncludes.h
aclTypesList.h
aclTypes.h
acl.h
aclHardware.h
aclUtilities.h
- DataTypes/aclConstant.h
- DataTypes/aclIndex.h
- DataTypes/aclGroupID.h
- DataTypes/aclIndexExt.h
- DataTypes/aclPrivateVariable.h
- DataTypes/aclPrivateArray.h
- DataTypes/aclLocalArray.h
- DataTypes/aclVariable.h
- DataTypes/aclVariableReference.h
- DataTypes/aclVariableSP.h
- DataTypes/aclMemBlock.h
- DataTypes/aclArray.h
- DataTypes/aclSubvector.h
- Kernels/aclExpressionContainer.h
- Kernels/aclKernel.h
- Kernels/aclKernelConfiguration.h
- Kernels/aclKernelConfigurationTemplates.h
- Kernels/aclKernelMerger.h
aclElementBase.h
aclGenerators.h
)
set(aslacl_SOURCES
- ${aslacl_PUBLIC_HEADERS}
+ ${acloperators_SOURCES}
+ ${aclmath_SOURCES}
+ ${acldatatypes_SOURCES}
+ ${aclkernels_SOURCES}
acl.cxx
aclHardware.cxx
aclUtilities.cxx
- DataTypes/aclConstant.cxx
- DataTypes/aclIndex.cxx
- DataTypes/aclGroupID.cxx
- DataTypes/aclIndexExt.cxx
- DataTypes/aclPrivateVariable.cxx
- DataTypes/aclPrivateArray.cxx
- DataTypes/aclLocalArray.cxx
- DataTypes/aclVariable.cxx
- DataTypes/aclVariableReference.cxx
- DataTypes/aclVariableSP.cxx
- DataTypes/aclMemBlock.cxx
- DataTypes/aclArray.cxx
- DataTypes/aclSubvector.cxx
- Kernels/aclExpressionContainer.cxx
- Kernels/aclKernel.cxx
- Kernels/aclKernelConfiguration.cxx
- Kernels/aclKernelConfigurationTemplates.cxx
- Kernels/aclKernelMerger.cxx
aclElementBase.cxx
aclGenerators.cxx
)
-add_library(aslacl ${aslacl_SOURCES})
-target_link_libraries(aslacl PUBLIC aslcommon aslacloperators aslaclmath ${OpenCL_LIBRARIES})
-INSTALL_SUBLIB(aslacl aslacl_PUBLIC_HEADERS)
+add_library(aslacl ${aslacl_PUBLIC_HEADERS} ${aslacl_SOURCES})
+target_link_libraries(aslacl PUBLIC aslcommon ${OpenCL_LIBRARIES})
+INSTALL_SUBLIB(aslacl aslacl_PUBLIC_HEADERS)
\ No newline at end of file
diff --git a/src/acl/DataTypes/acldatatypes.cmake b/src/acl/DataTypes/acldatatypes.cmake
new file mode 100644
index 0000000..3fb00f3
--- /dev/null
+++ b/src/acl/DataTypes/acldatatypes.cmake
@@ -0,0 +1,33 @@
+# acldatatypes
+
+set(acldatatypes_PUBLIC_HEADERS
+ DataTypes/aclConstant.h
+ DataTypes/aclIndex.h
+ DataTypes/aclGroupID.h
+ DataTypes/aclIndexExt.h
+ DataTypes/aclPrivateVariable.h
+ DataTypes/aclPrivateArray.h
+ DataTypes/aclLocalArray.h
+ DataTypes/aclVariable.h
+ DataTypes/aclVariableReference.h
+ DataTypes/aclVariableSP.h
+ DataTypes/aclMemBlock.h
+ DataTypes/aclArray.h
+ DataTypes/aclSubvector.h
+)
+
+set(acldatatypes_SOURCES
+ DataTypes/aclConstant.cxx
+ DataTypes/aclIndex.cxx
+ DataTypes/aclGroupID.cxx
+ DataTypes/aclIndexExt.cxx
+ DataTypes/aclPrivateVariable.cxx
+ DataTypes/aclPrivateArray.cxx
+ DataTypes/aclLocalArray.cxx
+ DataTypes/aclVariable.cxx
+ DataTypes/aclVariableReference.cxx
+ DataTypes/aclVariableSP.cxx
+ DataTypes/aclMemBlock.cxx
+ DataTypes/aclArray.cxx
+ DataTypes/aclSubvector.cxx
+)
\ No newline at end of file
diff --git a/src/acl/Kernels/aclkernels.cmake b/src/acl/Kernels/aclkernels.cmake
new file mode 100644
index 0000000..0425e47
--- /dev/null
+++ b/src/acl/Kernels/aclkernels.cmake
@@ -0,0 +1,17 @@
+# aclkernels
+
+set(aclkernels_PUBLIC_HEADERS
+ Kernels/aclExpressionContainer.h
+ Kernels/aclKernel.h
+ Kernels/aclKernelConfiguration.h
+ Kernels/aclKernelConfigurationTemplates.h
+ Kernels/aclKernelMerger.h
+)
+
+set(aclkernels_SOURCES
+ Kernels/aclExpressionContainer.cxx
+ Kernels/aclKernel.cxx
+ Kernels/aclKernelConfiguration.cxx
+ Kernels/aclKernelConfigurationTemplates.cxx
+ Kernels/aclKernelMerger.cxx
+)
\ No newline at end of file
diff --git a/src/acl/Operators/CMakeLists.txt b/src/acl/Operators/CMakeLists.txt
deleted file mode 100644
index 016f9ad..0000000
--- a/src/acl/Operators/CMakeLists.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/acl)
-
-
-# aslacloperators
-
-set(aslacloperators_PUBLIC_HEADERS
- aclElementAssignmentSafe.h
- aclElementIfElse.h
- aclElementSum.h
- aclElementSubtraction.h
- aclElementSqrt.h
- aclElementSin.h
- aclElementProduct.h
- aclElementDivision.h
- aclElementGenericBinary.h
- aclGenericAtomicFunction.h
- aclElementGenericUnary.h
- aclElementCos.h
- aclElementSelect.h
- aclElementMad.h
- aclElementExcerpt.h
- aclElementParser.h
- aclElementSyncCopy.h
- aclOperatorUnary.h
- aclOperatorBinary.h
- aclOperatorTernary.h
- aclOperatorGeneric.h
- aclElementFor.h
- aclElementConvert.h
-)
-
-set(aslacloperators_SOURCES
- ${aslacloperators_PUBLIC_HEADERS}
- aclElementAssignmentSafe.cxx
- aclElementIfElse.cxx
- aclElementSum.cxx
- aclElementSubtraction.cxx
- aclElementSqrt.cxx
- aclElementSin.cxx
- aclElementProduct.cxx
- aclElementDivision.cxx
- aclElementGenericBinary.cxx
- aclGenericAtomicFunction.cxx
- aclElementGenericUnary.cxx
- aclElementCos.cxx
- aclElementSelect.cxx
- aclElementMad.cxx
- aclElementExcerpt.cxx
- aclElementParser.cxx
- aclElementSyncCopy.cxx
- aclOperatorUnary.cxx
- aclOperatorBinary.cxx
- aclOperatorTernary.cxx
- aclOperatorGeneric.cxx
- aclElementFor.cxx
- aclElementConvert.cxx
-)
-
-add_library(aslacloperators ${aslacloperators_SOURCES})
-target_link_libraries(aslacloperators PRIVATE ${OpenCL_LIBRARIES})
-INSTALL_SUBLIB(aslacloperators aslacloperators_PUBLIC_HEADERS)
diff --git a/src/acl/Operators/acloperators.cmake b/src/acl/Operators/acloperators.cmake
new file mode 100644
index 0000000..b5427ba
--- /dev/null
+++ b/src/acl/Operators/acloperators.cmake
@@ -0,0 +1,53 @@
+# acloperators
+
+set(acloperators_PUBLIC_HEADERS
+ Operators/aclElementAssignmentSafe.h
+ Operators/aclElementIfElse.h
+ Operators/aclElementSum.h
+ Operators/aclElementSubtraction.h
+ Operators/aclElementSqrt.h
+ Operators/aclElementSin.h
+ Operators/aclElementProduct.h
+ Operators/aclElementDivision.h
+ Operators/aclElementGenericBinary.h
+ Operators/aclGenericAtomicFunction.h
+ Operators/aclElementGenericUnary.h
+ Operators/aclElementCos.h
+ Operators/aclElementSelect.h
+ Operators/aclElementMad.h
+ Operators/aclElementExcerpt.h
+ Operators/aclElementParser.h
+ Operators/aclElementSyncCopy.h
+ Operators/aclOperatorUnary.h
+ Operators/aclOperatorBinary.h
+ Operators/aclOperatorTernary.h
+ Operators/aclOperatorGeneric.h
+ Operators/aclElementFor.h
+ Operators/aclElementConvert.h
+)
+
+set(acloperators_SOURCES
+ Operators/aclElementAssignmentSafe.cxx
+ Operators/aclElementIfElse.cxx
+ Operators/aclElementSum.cxx
+ Operators/aclElementSubtraction.cxx
+ Operators/aclElementSqrt.cxx
+ Operators/aclElementSin.cxx
+ Operators/aclElementProduct.cxx
+ Operators/aclElementDivision.cxx
+ Operators/aclElementGenericBinary.cxx
+ Operators/aclGenericAtomicFunction.cxx
+ Operators/aclElementGenericUnary.cxx
+ Operators/aclElementCos.cxx
+ Operators/aclElementSelect.cxx
+ Operators/aclElementMad.cxx
+ Operators/aclElementExcerpt.cxx
+ Operators/aclElementParser.cxx
+ Operators/aclElementSyncCopy.cxx
+ Operators/aclOperatorUnary.cxx
+ Operators/aclOperatorBinary.cxx
+ Operators/aclOperatorTernary.cxx
+ Operators/aclOperatorGeneric.cxx
+ Operators/aclElementFor.cxx
+ Operators/aclElementConvert.cxx
+)
\ No newline at end of file
diff --git a/src/acl/aclMath/CMakeLists.txt b/src/acl/aclMath/CMakeLists.txt
deleted file mode 100644
index f474147..0000000
--- a/src/acl/aclMath/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/acl)
-
-# aslaclmath
-
-set(aslaclmath_PUBLIC_HEADERS
- aclVectorOfElements.h
- aclVectorOfElementsDef.h
- aclVectorOfElementsOperations.h
- aclMatrixOfElements.h
- aclComplexNumOfElements.h
- aclQuaternionOfElements.h
- aclReductionAlgGenerator.h
- aclBarycentric.h
- aclMathAlg.h
-)
-
-set(aslaclmath_SOURCES
- ${aslaclmath_PUBLIC_HEADERS}
- aclVectorOfElementsDef.cxx
- aclVectorOfElementsOperations.cxx
- aclMatrixOfElements.cxx
- aclComplexNumOfElements.cxx
- aclQuaternionOfElements.cxx
- aclReductionAlgGenerator.cxx
- aclBarycentric.cxx
- aclMathAlg.cxx
-)
-
-add_library(aslaclmath ${aslaclmath_SOURCES})
-INSTALL_SUBLIB(aslaclmath aslaclmath_PUBLIC_HEADERS)
diff --git a/src/acl/aclMath/aclmath.cmake b/src/acl/aclMath/aclmath.cmake
new file mode 100644
index 0000000..834df77
--- /dev/null
+++ b/src/acl/aclMath/aclmath.cmake
@@ -0,0 +1,24 @@
+# aclmath
+
+set(aclmath_PUBLIC_HEADERS
+ aclMath/aclVectorOfElements.h
+ aclMath/aclVectorOfElementsDef.h
+ aclMath/aclVectorOfElementsOperations.h
+ aclMath/aclMatrixOfElements.h
+ aclMath/aclComplexNumOfElements.h
+ aclMath/aclQuaternionOfElements.h
+ aclMath/aclReductionAlgGenerator.h
+ aclMath/aclBarycentric.h
+ aclMath/aclMathAlg.h
+)
+
+set(aclmath_SOURCES
+ aclMath/aclVectorOfElementsDef.cxx
+ aclMath/aclVectorOfElementsOperations.cxx
+ aclMath/aclMatrixOfElements.cxx
+ aclMath/aclComplexNumOfElements.cxx
+ aclMath/aclQuaternionOfElements.cxx
+ aclMath/aclReductionAlgGenerator.cxx
+ aclMath/aclBarycentric.cxx
+ aclMath/aclMathAlg.cxx
+)
\ No newline at end of file
diff --git a/src/aslGenerators.h b/src/aslGenerators.h
index de1eb86..fc6cf71 100644
--- a/src/aslGenerators.h
+++ b/src/aslGenerators.h
@@ -24,9 +24,9 @@
#ifndef ASLGENERATORS_H
#define ASLGENERATORS_H
-#include<memory>
-//#include<acl/aclHardware.h>
-#include<acl/aclTypes.h>
+#include <memory>
+//#include <acl/aclHardware.h>
+#include "acl/aclTypes.h"
namespace cl
{
diff --git a/src/aslGeomInc.h b/src/aslGeomInc.h
index f7d2e69..b8f2ae7 100644
--- a/src/aslGeomInc.h
+++ b/src/aslGeomInc.h
@@ -24,9 +24,9 @@
#ifndef ASLGEOMINC_H
#define ASLGEOMINC_H
-#include<memory>
-#include<vector>
-#include<acl/aclHardware.h>
+#include <memory>
+#include <vector>
+#include "acl/aclHardware.h"
namespace acl
{
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
deleted file mode 100644
index 5737c14..0000000
--- a/src/data/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-include_directories(${CMAKE_SOURCE_DIR}/src)
-
-
-# asldata
-
-set(asldata_PUBLIC_HEADERS
- aslMemElement.h
- aslDataUtilities.h
- aslBlocks.h
- aslDataWrapper.h
- aslDataWithGhostNodes.h
- aslProbe.h
-)
-
-set(asldata_SOURCES
- ${asldata_PUBLIC_HEADERS}
- aslMemElement.cxx
- aslDataUtilities.cxx
- aslBlocks.cxx
- aslDataWrapper.cxx
- aslDataWithGhostNodes.cxx
- aslProbe.cxx
-)
-
-add_library(asldata ${asldata_SOURCES})
-INSTALL_SUBLIB(asldata asldata_PUBLIC_HEADERS)
diff --git a/src/data/asldata.cmake b/src/data/asldata.cmake
new file mode 100644
index 0000000..1307822
--- /dev/null
+++ b/src/data/asldata.cmake
@@ -0,0 +1,19 @@
+# asldata
+
+set(asldata_PUBLIC_HEADERS
+ data/aslMemElement.h
+ data/aslDataUtilities.h
+ data/aslBlocks.h
+ data/aslDataWrapper.h
+ data/aslDataWithGhostNodes.h
+ data/aslProbe.h
+)
+
+set(asldata_SOURCES
+ data/aslMemElement.cxx
+ data/aslDataUtilities.cxx
+ data/aslBlocks.cxx
+ data/aslDataWrapper.cxx
+ data/aslDataWithGhostNodes.cxx
+ data/aslProbe.cxx
+)
\ No newline at end of file
diff --git a/src/math/CMakeLists.txt b/src/math/CMakeLists.txt
deleted file mode 100644
index a6148f3..0000000
--- a/src/math/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-
-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/acl)
-
-
-# aslmath
-
-set(aslmath_PUBLIC_HEADERS
- aslVectors.h
- aslVectorsDynamicLength.h
- aslVectorsDynamicLengthOperations.h
- aslMatrices.h
- aslBarycentric.h
- aslInterpolation.h
- aslTemplates.h
- aslTemplatesExtras.h
- aslProbeTemplates.h
- aslTemplateVE.h
- aslTemplateVEExtras.h
- aslIndex2Position.h
- aslDistanceFunction.h
- aslDistanceFunctionAlg.h
- aslPositionFunction.h
-)
-
-set(aslmath_SOURCES
- ${aslmath_PUBLIC_HEADERS}
- aslMatrices.cxx
- aslBarycentric.cxx
- aslTemplates.cxx
- aslTemplatesExtras.cxx
- aslProbeTemplates.cxx
- aslTemplateVE.cxx
- aslTemplateVEExtras.cxx
- aslIndex2Position.cxx
- aslDistanceFunction.cxx
- aslDistanceFunctionAlg.cxx
- aslPositionFunction.cxx
-)
-
-add_library(aslmath ${aslmath_SOURCES})
-INSTALL_SUBLIB(aslmath aslmath_PUBLIC_HEADERS)
\ No newline at end of file
diff --git a/src/math/aslmath.cmake b/src/math/aslmath.cmake
new file mode 100644
index 0000000..cd33720
--- /dev/null
+++ b/src/math/aslmath.cmake
@@ -0,0 +1,33 @@
+# aslmath
+
+set(aslmath_PUBLIC_HEADERS
+ math/aslVectors.h
+ math/aslVectorsDynamicLength.h
+ math/aslVectorsDynamicLengthOperations.h
+ math/aslMatrices.h
+ math/aslBarycentric.h
+ math/aslInterpolation.h
+ math/aslTemplates.h
+ math/aslTemplatesExtras.h
+ math/aslProbeTemplates.h
+ math/aslTemplateVE.h
+ math/aslTemplateVEExtras.h
+ math/aslIndex2Position.h
+ math/aslDistanceFunction.h
+ math/aslDistanceFunctionAlg.h
+ math/aslPositionFunction.h
+)
+
+set(aslmath_SOURCES
+ math/aslMatrices.cxx
+ math/aslBarycentric.cxx
+ math/aslTemplates.cxx
+ math/aslTemplatesExtras.cxx
+ math/aslProbeTemplates.cxx
+ math/aslTemplateVE.cxx
+ math/aslTemplateVEExtras.cxx
+ math/aslIndex2Position.cxx
+ math/aslDistanceFunction.cxx
+ math/aslDistanceFunctionAlg.cxx
+ math/aslPositionFunction.cxx
+)
\ No newline at end of file
diff --git a/src/num/CMakeLists.txt b/src/num/CMakeLists.txt
index 4a83e58..e5b874e 100644
--- a/src/num/CMakeLists.txt
+++ b/src/num/CMakeLists.txt
@@ -68,5 +68,5 @@ set(aslnum_SOURCES
)
add_library(aslnum ${aslnum_SOURCES})
-target_link_libraries(aslnum aslacl asl)
-INSTALL_SUBLIB(aslnum aslnum_PUBLIC_HEADERS)
+target_link_libraries(aslnum PRIVATE ${OpenCL_LIBRARIES} aslacl aslcommon asl)
+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 2758a48..67b8eb3 100644
--- a/src/numExtend/CMakeLists.txt
+++ b/src/numExtend/CMakeLists.txt
@@ -12,5 +12,6 @@ set(aslnumext_SOURCES
aslFDAdvectionDiffusionExtended.cxx
)
-add_library(aslnumext ${aslnumext_SOURCES})
+add_library(aslnumext ${aslnumext_SOURCES})
+target_link_libraries(aslnumext PRIVATE ${OpenCL_LIBRARIES} aslacl aslcommon asl)
INSTALL_SUBLIB(aslnumext aslnumext_PUBLIC_HEADERS)
diff --git a/test/testABD/CMakeLists.txt b/test/testABD/CMakeLists.txt
index 53b349e..8c51521 100644
--- a/test/testABD/CMakeLists.txt
+++ b/test/testABD/CMakeLists.txt
@@ -1,5 +1,5 @@
include_directories(${CMAKE_SOURCE_DIR}/src)
add_executable(testABDFormat testABDFormat.cc)
-target_link_libraries(testABDFormat asldata aslmath asl)
+target_link_libraries(testABDFormat asl aslcommon)
add_test(NAME testABDFormat COMMAND testABDFormat)
\ No newline at end of file
diff --git a/test/testACL/CMakeLists.txt b/test/testACL/CMakeLists.txt
index 31bef4d..22c6ff5 100644
--- a/test/testACL/CMakeLists.txt
+++ b/test/testACL/CMakeLists.txt
@@ -5,7 +5,7 @@ target_link_libraries(testVectorOfElements aslacl)
add_test(NAME testVectorOfElements COMMAND testVectorOfElements)
add_executable(testMatrixOfElements testMatrixOfElements.cc)
-target_link_libraries(testMatrixOfElements aslacl aslmath asldata asl)
+target_link_libraries(testMatrixOfElements asl aslacl aslcommon)
add_test(NAME testMatrixOfElements COMMAND testMatrixOfElements)
add_executable(testPerformance testPerformance.cc)
diff --git a/test/testMath/CMakeLists.txt b/test/testMath/CMakeLists.txt
index b34d524..99af33c 100644
--- a/test/testMath/CMakeLists.txt
+++ b/test/testMath/CMakeLists.txt
@@ -1,11 +1,11 @@
include_directories(${CMAKE_SOURCE_DIR}/src)
add_executable(testASLData testASLData.cc)
-target_link_libraries(testASLData aslmath asl)
+target_link_libraries(testASLData asl)
add_test(NAME testASLData COMMAND testASLData)
add_executable(testDistanceFunction testDistanceFunction.cc)
-target_link_libraries(testDistanceFunction aslmath aslvtk aslnum asl)
+target_link_libraries(testDistanceFunction aslvtk aslnum asl)
add_test(NAME testDistanceFunction COMMAND testDistanceFunction)
add_executable(testReductionFunction testReductionFunction.cc)
--
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