Merge pull request #76 from seanyen/windows_fix

Initial Windows bring-up

Author: jcarpent

CMakeLists.txt

@@ -109,6 +109,8 @@ SET(${PROJECT_NAME}_HEADERS
 INCLUDE_DIRECTORIES(${${PROJECT_NAME}_BINARY_DIR}/include)
 INCLUDE_DIRECTORIES(${${PROJECT_NAME}_SOURCE_DIR}/include)
 
+LINK_DIRECTORIES(${PYTHON_LIBRARY_DIRS})
+
 # ----------------------------------------------------
 # --- TARGETS ----------------------------------------
 # ----------------------------------------------------
@@ -131,11 +133,21 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}${P
 
 TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})
 PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+INSTALL(TARGETS ${PROJECT_NAME}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+  ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+  RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 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}>")
+
+INSTALL(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/eigenpy/${PROJECT_NAME}_export.h
+  DESTINATION include/eigenpy)
 # ----------------------------------------------------
 # --- PYTHON LIBRARY ---------------------------------
 # ----------------------------------------------------

include/eigenpy/details.hpp

@@ -300,7 +300,7 @@ namespace eigenpy
       // Check if the Scalar type of the obj_ptr is compatible with the Scalar type of MatType
       if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(obj_ptr), 0)) == NPY_INT)
       {
-        if(not FromTypeToType<int,typename MatType::Scalar>::value)
+        if(!FromTypeToType<int,typename MatType::Scalar>::value)
         {
 #ifndef NDEBUG
           std::cerr << "The Python matrix scalar type (int) cannot be converted into the scalar type of the Eigen matrix. Loss of arithmetic precision" << std::endl;
@@ -310,7 +310,7 @@ namespace eigenpy
       }
       else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(obj_ptr), 0)) == NPY_LONG)
       {
-        if(not FromTypeToType<long,typename MatType::Scalar>::value)
+        if(!FromTypeToType<long,typename MatType::Scalar>::value)
         {
 #ifndef NDEBUG
           std::cerr << "The Python matrix scalar type (long) cannot be converted into the scalar type of the Eigen matrix. Loss of arithmetic precision" << std::endl;
@@ -320,7 +320,7 @@ namespace eigenpy
       }
       else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(obj_ptr), 0)) == NPY_FLOAT)
       {
-        if(not FromTypeToType<float,typename MatType::Scalar>::value)
+        if(!FromTypeToType<float,typename MatType::Scalar>::value)
         {
 #ifndef NDEBUG
           std::cerr << "The Python matrix scalar type (float) cannot be converted into the scalar type of the Eigen matrix. Loss of arithmetic precision" << std::endl;
@@ -330,7 +330,7 @@ namespace eigenpy
       }
       else if ((PyArray_ObjectType(reinterpret_cast<PyObject *>(obj_ptr), 0)) == NPY_DOUBLE)
       {
-        if(not FromTypeToType<double,typename MatType::Scalar>::value)
+        if(!FromTypeToType<double,typename MatType::Scalar>::value)
         {
 #ifndef NDEBUG
           std::cerr << "The Python matrix scalar (double) type cannot be converted into the scalar type of the Eigen matrix. Loss of arithmetic precision." << std::endl;

include/eigenpy/eigenpy.hpp

@@ -8,6 +8,7 @@
 
 #include "eigenpy/fwd.hpp"
 #include "eigenpy/deprecated.hh"
+#include "eigenpy/eigenpy_export.h"
 #if EIGEN_VERSION_AT_LEAST(3,2,0)
 #include "eigenpy/ref.hpp"
 
@@ -25,7 +26,7 @@
 namespace eigenpy
 {
   /* Enable Eigen-Numpy serialization for a set of standard MatrixBase instance. */
-  void enableEigenPy();
+  void EIGENPY_EXPORT enableEigenPy();
 
   template<typename MatType>
   void enableEigenPySpecific();

include/eigenpy/expose.hpp

@@ -27,7 +27,7 @@ namespace eigenpy
   template<typename T>
   inline void expose()
   {
-    if(not register_symbolic_link_to_registered_type<T>())
+    if(!register_symbolic_link_to_registered_type<T>())
       internal::call_expose<T>::run();
   }
 }

include/eigenpy/geometry.hpp

@@ -6,13 +6,15 @@
 #ifndef __eigenpy_geometry_hpp__
 #define __eigenpy_geometry_hpp__
 
+#include "eigenpy/eigenpy_export.h"
+
 namespace eigenpy
 {
 
-  void exposeQuaternion();
-  void exposeAngleAxis();
+  void EIGENPY_EXPORT exposeQuaternion();
+  void EIGENPY_EXPORT exposeAngleAxis();
 
-  void exposeGeometryConversion();
+  void EIGENPY_EXPORT exposeGeometryConversion();
 
 } // namespace eigenpy
 

include/eigenpy/ref.hpp

@@ -11,19 +11,19 @@
 
 // For old Eigen versions, EIGEN_DEVICE_FUNC is not defined.
 // We must define it just in the scope of this file.
-#if not EIGEN_VERSION_AT_LEAST(3,2,90)
+#if !EIGEN_VERSION_AT_LEAST(3,2,90)
 #define EIGEN_DEVICE_FUNC
 #endif
 
 namespace eigenpy
 {
 
-  template<typename PlainObjectType>
-  struct Ref : Eigen::Ref<PlainObjectType,EIGENPY_DEFAULT_ALIGNMENT_VALUE,typename StrideType<PlainObjectType>::type>
+  template<typename PlainObjectTypeT>
+  struct Ref : Eigen::Ref<PlainObjectTypeT,EIGENPY_DEFAULT_ALIGNMENT_VALUE,typename StrideType<PlainObjectTypeT>::type>
   {
   public:
-    typedef Eigen::Ref<PlainObjectType,EIGENPY_DEFAULT_ALIGNMENT_VALUE,typename StrideType<PlainObjectType>::type> Base;
-    
+    typedef Eigen::Ref<PlainObjectTypeT,EIGENPY_DEFAULT_ALIGNMENT_VALUE,typename eigenpy::template StrideType<PlainObjectTypeT>::type> Base;
+
   private:
     typedef Eigen::internal::traits<Base> Traits;
     template<typename Derived>
@@ -83,7 +83,7 @@ namespace eigenpy
   }; // struct Ref<PlainObjectType>
 }
 
-#if not EIGEN_VERSION_AT_LEAST(3,2,90)
+#if !EIGEN_VERSION_AT_LEAST(3,2,90)
 #undef EIGEN_DEVICE_FUNC
 #endif
 

include/eigenpy/solvers/preconditioners.hpp

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

include/eigenpy/solvers/solvers.hpp

@@ -17,11 +17,13 @@
 #ifndef __eigenpy_solvers_hpp__
 #define __eigenpy_solvers_hpp__
 
+#include "eigenpy/eigenpy_export.h"
+
 namespace eigenpy
 {
   struct SolversScope {};
 
-  void exposeSolvers();
+  void EIGENPY_EXPORT exposeSolvers();
 
 } // namespace eigenpy
 

python/CMakeLists.txt

@@ -33,6 +33,8 @@ SET_PROPERTY(TARGET ${PYWRAP} PROPERTY LINKER_LANGUAGE CXX)
 IF(APPLE)
   # We need to change the extension for python bindings
   SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES SUFFIX ".so")
+ELSEIF(WIN32)
+  SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES SUFFIX ".pyd")
 ENDIF(APPLE)
 
 SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES