Fixes gsl example compilation issue.

[ci skip]
neelakanthuk · Nov 2, 2017 · 1a4a63f · 1a4a63f
1 parent 8efdca9
commit 1a4a63f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/example/matrix/CMakeLists.txt b/example/matrix/CMakeLists.txt
@@ -10,11 +10,13 @@ project(Matrix)
 
 find_package(YARP REQUIRED)
 
+find_package(GSL REQUIRED)
+
 include_directories(${CMAKE_SOURCE_DIR})
 
 add_executable(basic_ops basic_ops.cpp)
 target_link_libraries(basic_ops ${YARP_LIBRARIES})
 
 add_executable(gsl_example gsl_example.cpp)
-target_link_libraries(gsl_example ${YARP_LIBRARIES})
+target_link_libraries(gsl_example ${YARP_LIBRARIES} YARP::YARP_gsl GSL::gsl GSL::gslcblas)
 
diff --git a/example/matrix/gsl_example.cpp b/example/matrix/gsl_example.cpp
@@ -18,8 +18,10 @@
 
 #include <yarp/sig/Matrix.h>
 #include <yarp/sig/Vector.h>
+#include <yarp/gsl/Gsl.h>
 
 using namespace yarp::sig;
+using namespace yarp::gsl;
 
 int main(int argc, const char **argv)
 {
@@ -29,8 +31,8 @@ int main(int argc, const char **argv)
     v2=1;
 
     double r;
-    gsl_blas_ddot((gsl_vector *)(v1.getGslVector()),
-                  (gsl_vector *)(v2.getGslVector()), &r);
+    gsl_blas_ddot((gsl_vector *)GslVector(v1).getGslVector(),
+                  (gsl_vector *)GslVector(v2).getGslVector(), &r);
 
     printf("Res vector: %lf\n", r);
 
@@ -51,10 +53,10 @@ int main(int argc, const char **argv)
 
     gsl_blas_dgemm(CblasNoTrans, CblasNoTrans,
         1.0,
-        (const gsl_matrix *) m1.getGslMatrix(),
-        (const gsl_matrix *) m2.getGslMatrix(),
+        (const gsl_matrix *) GslMatrix(m1).getGslMatrix(),
+        (const gsl_matrix *) GslMatrix(m2).getGslMatrix(),
         0.0,
-        (gsl_matrix *) m3.getGslMatrix());
+        (gsl_matrix *)GslMatrix(m3).getGslMatrix());
 
     printf("Result: (%s)", m3.toString().c_str());