Merge pull request #149 from jcarpent/devel

Remove ${PROJECT_NAME}_export

Author: jcarpent

CMakeLists.txt

@@ -174,15 +174,9 @@ INSTALL(TARGETS ${PROJECT_NAME}
 ADD_HEADER_GROUP(${PROJECT_NAME}_HEADERS)
 ADD_SOURCE_GROUP(${PROJECT_NAME}_SOURCES)
 
-INCLUDE(GenerateExportHeader)
-GENERATE_EXPORT_HEADER(${PROJECT_NAME} EXPORT_FILE_NAME eigenpy/${PROJECT_NAME}_export.h)
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>")
 SET(PUBLIC_HEADER ${${PROJECT_NAME}_HEADERS})
 
-INSTALL(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/eigenpy/${PROJECT_NAME}_export.h
-  DESTINATION include/eigenpy)
-
 # Install package for ROS
 install(FILES package.xml DESTINATION share/eigenpy)
 

include/eigenpy/computation-info.hpp

@@ -8,11 +8,11 @@
 #include <Eigen/Core>
 #include <boost/python.hpp>
 
-#include "eigenpy/eigenpy_export.h"
+#include "eigenpy/config.hpp"
 
 namespace eigenpy
 {
-  inline void EIGENPY_EXPORT exposeComputationInfo()
+  inline void EIGENPY_DLLEXPORT exposeComputationInfo()
   {
     boost::python::enum_<Eigen::ComputationInfo>("ComputationInfo")
     .value("Success",Eigen::Success)

include/eigenpy/decompositions/decompositions.hpp

@@ -5,11 +5,11 @@
 #ifndef __eigenpy_decompositions_decompositions_hpp__
 #define __eigenpy_decompositions_decompositions_hpp__
 
-#include "eigenpy/eigenpy_export.h"
+#include "eigenpy/config.hpp"
 
 namespace eigenpy
 {
-  void EIGENPY_EXPORT exposeDecompositions();
+  void EIGENPY_DLLEXPORT exposeDecompositions();
 } // namespace eigenpy
 
 #endif // define __eigenpy_decompositions_decompositions_hpp__

include/eigenpy/eigenpy.hpp

@@ -1,14 +1,14 @@
 /*
  * Copyright 2014-2019, CNRS
- * Copyright 2018-2019, INRIA
+ * Copyright 2018-2020, INRIA
  */
 
 #ifndef __eigenpy_eigenpy_hpp__
 #define __eigenpy_eigenpy_hpp__
 
 #include "eigenpy/fwd.hpp"
 #include "eigenpy/deprecated.hpp"
-#include "eigenpy/eigenpy_export.h"
+#include "eigenpy/config.hpp"
 
 #if EIGEN_VERSION_AT_LEAST(3,2,0)
 #include "eigenpy/ref.hpp"
@@ -28,7 +28,7 @@ namespace eigenpy
 {
 
   /* Enable Eigen-Numpy serialization for a set of standard MatrixBase instance. */
-  void EIGENPY_EXPORT enableEigenPy();
+  void EIGENPY_DLLEXPORT enableEigenPy();
 
   template<typename MatType>
   void enableEigenPySpecific();

include/eigenpy/geometry.hpp

@@ -1,20 +1,20 @@
 /*
  * Copyright 2014-2019, CNRS
- * Copyright 2018-2019, INRIA
+ * Copyright 2018-2020, INRIA
  */
 
 #ifndef __eigenpy_geometry_hpp__
 #define __eigenpy_geometry_hpp__
 
-#include "eigenpy/eigenpy_export.h"
+#include "eigenpy/config.hpp"
 
 namespace eigenpy
 {
 
-  void EIGENPY_EXPORT exposeQuaternion();
-  void EIGENPY_EXPORT exposeAngleAxis();
+  void EIGENPY_DLLEXPORT exposeQuaternion();
+  void EIGENPY_DLLEXPORT exposeAngleAxis();
 
-  void EIGENPY_EXPORT exposeGeometryConversion();
+  void EIGENPY_DLLEXPORT exposeGeometryConversion();
 
 } // namespace eigenpy
 

include/eigenpy/solvers/preconditioners.hpp

@@ -17,12 +17,12 @@
 #ifndef __eigenpy_preconditioners_hpp__
 #define __eigenpy_preconditioners_hpp__
 
-#include "eigenpy/eigenpy_export.h"
+#include "eigenpy/config.hpp"
 
 namespace eigenpy
 {
 
-  void EIGENPY_EXPORT exposePreconditioners();
+  void EIGENPY_DLLEXPORT exposePreconditioners();
 
 } // namespace eigenpy
 

include/eigenpy/solvers/solvers.hpp

@@ -1,29 +1,17 @@
 /*
- * Copyright 2017, Justin Carpentier, LAAS-CNRS
- *
- * This file is part of eigenpy.
- * eigenpy is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- * eigenpy is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.  You should
- * have received a copy of the GNU Lesser General Public License along
- * with eigenpy.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2017-2020 CNRS INRIA
  */
 
 #ifndef __eigenpy_solvers_hpp__
 #define __eigenpy_solvers_hpp__
 
-#include "eigenpy/eigenpy_export.h"
+#include "eigenpy/config.hpp"
 
 namespace eigenpy
 {
   struct SolversScope {};
 
-  void EIGENPY_EXPORT exposeSolvers();
+  void EIGENPY_DLLEXPORT exposeSolvers();
 
 } // namespace eigenpy
 

include/eigenpy/version.hpp

@@ -1,12 +1,12 @@
 //
-// Copyright (c) 2019 INRIA
+// Copyright (c) 2019-2020 INRIA
 //
 
 #ifndef __eigenpy_version_hpp__
 #define __eigenpy_version_hpp__
 
 #include "eigenpy/config.hpp"
-#include "eigenpy/eigenpy_export.h"
+#include "eigenpy/config.hpp"
 
 #include <string>
 
@@ -18,7 +18,7 @@ namespace eigenpy
   ///        the following standard:
   ///        EIGENPY_MINOR_VERSION.EIGENPY_MINOR_VERSION.EIGENPY_PATCH_VERSION
   ///
-  std::string EIGENPY_EXPORT printVersion(const std::string & delimiter = ".");
+  std::string EIGENPY_DLLEXPORT printVersion(const std::string & delimiter = ".");
 
   ///
   /// \brief Checks if the current version of EigenPy is at least the version provided
@@ -31,7 +31,7 @@ namespace eigenpy
   /// \returns true if the current version of EigenPy is greater than the version provided
   ///        by the input arguments.
   ///
-  bool EIGENPY_EXPORT checkVersionAtLeast(unsigned int major_version,
+  bool EIGENPY_DLLEXPORT checkVersionAtLeast(unsigned int major_version,
                                           unsigned int minor_version,
                                           unsigned int patch_version);
 }