Skip to content

Commit c519bb2

Browse files
authored
Merge pull request #139 from jcarpent/devel
cmake: handle Win32
2 parents 02d4380 + 1c2e158 commit c519bb2

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ ENDIF(BUILD_UNIT_TESTS)
5656
FINDPYTHON()
5757
FIND_NUMPY()
5858

59+
IF(WIN32)
60+
LINK_DIRECTORIES(${PYTHON_LIBRARY_DIRS})
61+
ENDIF(WIN32)
62+
5963
# ----------------------------------------------------
6064
# --- DEPENDENCIES -----------------------------------
6165
# ----------------------------------------------------

include/eigenpy/version.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define __eigenpy_version_hpp__
77

88
#include "eigenpy/config.hpp"
9+
#include "eigenpy/eigenpy_export.h"
910

1011
#include <string>
1112

@@ -17,7 +18,7 @@ namespace eigenpy
1718
/// the following standard:
1819
/// EIGENPY_MINOR_VERSION.EIGENPY_MINOR_VERSION.EIGENPY_PATCH_VERSION
1920
///
20-
std::string printVersion(const std::string & delimiter = ".");
21+
std::string EIGENPY_EXPORT printVersion(const std::string & delimiter = ".");
2122

2223
///
2324
/// \brief Checks if the current version of EigenPy is at least the version provided
@@ -30,9 +31,9 @@ namespace eigenpy
3031
/// \returns true if the current version of EigenPy is greater than the version provided
3132
/// by the input arguments.
3233
///
33-
bool checkVersionAtLeast(unsigned int major_version,
34-
unsigned int minor_version,
35-
unsigned int patch_version);
34+
bool EIGENPY_EXPORT checkVersionAtLeast(unsigned int major_version,
35+
unsigned int minor_version,
36+
unsigned int patch_version);
3637
}
3738

3839
#endif // __eigenpy_version_hpp__

0 commit comments

Comments
 (0)