From d942bcacd352df6eac47b6112831d6663e9f3c06 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Tue, 10 Dec 2019 14:40:00 +0100 Subject: [PATCH 1/2] cmake: handle Win32 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a99ea37a..7fc189498 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,10 @@ ENDIF(BUILD_UNIT_TESTS) FINDPYTHON() FIND_NUMPY() +IF(WIN32) + LINK_DIRECTORIES(${PYTHON_LIBRARY_DIRS}) +ENDIF(WIN32) + # ---------------------------------------------------- # --- DEPENDENCIES ----------------------------------- # ---------------------------------------------------- From 1c2e158904fdf43d4c618c32cc946f282d582502 Mon Sep 17 00:00:00 2001 From: Justin Carpentier Date: Tue, 10 Dec 2019 15:05:28 +0100 Subject: [PATCH 2/2] version: add export of functions --- include/eigenpy/version.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/eigenpy/version.hpp b/include/eigenpy/version.hpp index ca389bf65..77cf08401 100644 --- a/include/eigenpy/version.hpp +++ b/include/eigenpy/version.hpp @@ -6,6 +6,7 @@ #define __eigenpy_version_hpp__ #include "eigenpy/config.hpp" +#include "eigenpy/eigenpy_export.h" #include @@ -17,7 +18,7 @@ namespace eigenpy /// the following standard: /// EIGENPY_MINOR_VERSION.EIGENPY_MINOR_VERSION.EIGENPY_PATCH_VERSION /// - std::string printVersion(const std::string & delimiter = "."); + std::string EIGENPY_EXPORT printVersion(const std::string & delimiter = "."); /// /// \brief Checks if the current version of EigenPy is at least the version provided @@ -30,9 +31,9 @@ namespace eigenpy /// \returns true if the current version of EigenPy is greater than the version provided /// by the input arguments. /// - bool checkVersionAtLeast(unsigned int major_version, - unsigned int minor_version, - unsigned int patch_version); + bool EIGENPY_EXPORT checkVersionAtLeast(unsigned int major_version, + unsigned int minor_version, + unsigned int patch_version); } #endif // __eigenpy_version_hpp__