Skip to content

cmake: handle Win32 #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 10, 2019
Merged

cmake: handle Win32 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d942bca
cmake: handle Win32
jcarpent Dec 10, 2019
1c2e158
version: add export of functions
jcarpent Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ ENDIF(BUILD_UNIT_TESTS)
FINDPYTHON()
FIND_NUMPY()

IF(WIN32)
LINK_DIRECTORIES(${PYTHON_LIBRARY_DIRS})
ENDIF(WIN32)

# ----------------------------------------------------
# --- DEPENDENCIES -----------------------------------
# ----------------------------------------------------
Expand Down
9 changes: 5 additions & 4 deletions include/eigenpy/version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#define __eigenpy_version_hpp__

#include "eigenpy/config.hpp"
#include "eigenpy/eigenpy_export.h"

#include <string>

Expand All @@ -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
Expand All @@ -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__