Merge branch 'gsl_cleanup'

bhigy · Dec 1, 2016 · bd7782e · bd7782e
2 parents 64f2860 + 7fec14b
commit bd7782e
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 22 deletions.
diff --git a/cmake/YarpDescribe.cmake b/cmake/YarpDescribe.cmake
@@ -40,7 +40,9 @@ foreach(lib ${YARP_LIBS})
      NOT "${lib}" STREQUAL "YARP_wire_rep_utils" AND
      NOT "${lib}" STREQUAL "YARP_manager" AND
      NOT "${lib}" STREQUAL "YARP_logger" AND
-     NOT "${lib}" STREQUAL "YARP_serversql")
+     NOT "${lib}" STREQUAL "YARP_serversql" AND
+     NOT "${lib}" STREQUAL "YARP_gsl" AND
+     NOT "${lib}" STREQUAL "YARP_eigen")
     list(APPEND YARP_LIBRARIES YARP::${lib})
   endif()
 endforeach()

diff --git a/doc/release/v2_3_68_1.md b/doc/release/v2_3_68_1.md
@@ -6,6 +6,13 @@ A (partial) list of bug fixed and issues resolved in this release can be found
 [here](https://github.com/robotology/yarp/issues?q=label%3A%22Fixed+in%3A+YARP+2.3.68.1%22).
 
 
+Important Changes
+-----------------
+
+* `YARP_gsl` was removed the `YARP_LIBRARIES` CMake variable where it was
+  erroneously added. If you are using that library you might need to add
+  `YARP::YARP_gsl` to the list of libraries linked by your target.
+
 Bug Fixes
 ---------
 
@@ -14,6 +21,7 @@ Bug Fixes
 * Fix `YARP_CLEAN_API` build with GCC 6.1 or later (that uses c++14 by default)
   by forcing `-std=c++98` (#978).
 
+
 ### Private libraries
 
 #### YARP_manager

diff --git a/src/libYARP_gsl/CMakeLists.txt b/src/libYARP_gsl/CMakeLists.txt
@@ -7,10 +7,11 @@ project(YARP_gsl)
 set(YARP_gsl_HDRS include/yarp/gsl/api.h
                   include/yarp/gsl/Gsl.h)
 set(YARP_gsl_SRCS src/Gsl.cpp)
-set(YARP_gsl_IMPL_HDRS include/yarp/gsl_compatibility.h)
+set(YARP_gsl_IMPL_HDRS include/yarp/gsl/impl/gsl_structs.h)
 
 source_group("Source Files" FILES ${YARP_gsl_SRCS})
 source_group("Header Files" FILES ${YARP_gsl_HDRS})
+source_group("Implementation Header Files" FILES ${YARP_gsl_IMPL_HDRS})
 
 set_property(GLOBAL APPEND PROPERTY YARP_TREE_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include")
 get_property(YARP_TREE_INCLUDE_DIRS GLOBAL PROPERTY YARP_TREE_INCLUDE_DIRS)

diff --git a/src/libYARP_gsl/include/yarp/gsl/Gsl.h b/src/libYARP_gsl/include/yarp/gsl/Gsl.h
@@ -8,17 +8,17 @@
 #define YARP_GSL_GSL_HEADER_H
 
 /**
-This library provides functions for compatibility with GSL. Including/linking GSL
-forces this library to be GPL.
-*/
+ * This library provides functions for compatibility with GSL.
+ * @warning Including/linking GSL forces this library to be GPL.
+ */
 
 #include <yarp/sig/Matrix.h>
 #include <yarp/sig/Vector.h>
 #include <yarp/gsl/api.h>
 
 namespace yarp {
     /**
-    * A library for interoperability with the GSL library. 
+    * A library for interoperability with the GSL library.
     */
     namespace gsl {
         class GslMatrix;
@@ -31,7 +31,7 @@ namespace yarp {
 * Legacy code like:
 * Matrix m;
 * gsl_function(m.getGslMatrix());
-* 
+*
 * Should be replaced with:
 * Matrix m;
 * gsl_function(GslMatrix(m).getGslMatrix());
@@ -49,7 +49,7 @@ class YARP_gsl_API yarp::gsl::GslMatrix
     * Return GSL compatile pointer.
     */
     void *getGslMatrix();
-    
+
     /**
     * Return GSL compatile, const pointer.
     */

diff --git a/src/libYARP_gsl/include/yarp/gsl/api.h b/src/libYARP_gsl/include/yarp/gsl/api.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2016 iCub Facility, Istituto Italiano di Tecnologia
  * Authors: Lorenzo Natale
- * CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
+ * CopyPolicy: Released under the terms of the GPLv2 or later
  *
  */
 

diff --git a/...YARP_gsl/include/yarp/gsl_compatibility.h → ...P_gsl/include/yarp/gsl/impl/gsl_structs.h b/...YARP_gsl/include/yarp/gsl_compatibility.h → ...P_gsl/include/yarp/gsl/impl/gsl_structs.h
@@ -1,16 +1,19 @@
 /*
 * Copyright (C) 2007 RobotCub Consortium
 * Authors: Lorenzo Natale
-* CopyPolicy: Released under the terms of the LGPLv2.1 or later, see LGPL.TXT
+* CopyPolicy: Released under the terms of the GPLv2 or later
 */
 
 /**
-* Defines types for binary compatibily with the GSL. Included by cpp
-* files within yarp.
+* Defines types for binary compatibily with the GSL.
 */
 
+#ifndef YARP_GSL_IMPL_GSL_COMPATIBILITY_H
+#define YARP_GSL_IMPL_GSL_COMPATIBILITY_H
+
 #include <stddef.h>
 
+
 #ifndef gsl_block
 typedef struct
 {
@@ -42,4 +45,4 @@ struct gsl_matrix
 };
 #endif
 
-//
+#endif // YARP_GSL_IMPL_GSL_COMPATIBILITY_H
diff --git a/src/libYARP_gsl/src/Gsl.cpp b/src/libYARP_gsl/src/Gsl.cpp
@@ -4,14 +4,13 @@
 * CopyPolicy: Released under the terms of the GPL 2.0 license or later.
 */
 
-/** 
-This library provides functions for compatibility with GSL. Including/linking GSL 
-forces this library to be GPL.
-*/
-
-#include <yarp/gsl_compatibility.h>
+/**
+ * This library provides functions for compatibility with GSL.
+ * @warning Including/linking GSL forces this library to be GPL.
+ */
 
 #include <yarp/gsl/Gsl.h>
+#include <yarp/gsl/impl/gsl_structs.h>
 #include <yarp/sig/Matrix.h>
 #include <yarp/sig/Vector.h>
 

diff --git a/tests/libYARP_sig/MatrixTest.cpp b/tests/libYARP_sig/MatrixTest.cpp
@@ -14,7 +14,7 @@
 #include <yarp/os/PortablePair.h>
 
 #include <yarp/gsl/Gsl.h>
-#include <yarp/gsl_compatibility.h>
+#include <yarp/gsl/impl/gsl_structs.h>
 
 #include <math.h>
 #include <vector>

diff --git a/tests/libYARP_sig/VectorOfTest.cpp b/tests/libYARP_sig/VectorOfTest.cpp
@@ -14,7 +14,7 @@
 
 //#include <vector>
 
-#include <yarp/gsl_compatibility.h>
+#include <yarp/gsl/impl/gsl_structs.h>
 
 #include "TestList.h"
 

diff --git a/tests/libYARP_sig/VectorTest.cpp b/tests/libYARP_sig/VectorTest.cpp
@@ -15,7 +15,7 @@
 //#include <vector>
 
 #include <yarp/gsl/Gsl.h>
-#include <yarp/gsl_compatibility.h>
+#include <yarp/gsl/impl/gsl_structs.h>
 
 #include "TestList.h"