Skip to content

Commit

Permalink
Improved installers
Browse files Browse the repository at this point in the history
  • Loading branch information
pbosetti committed Jun 9, 2021
1 parent afc7a65 commit f795bba
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,11 @@ install(TARGETS ${TARGETS_LIST}
ARCHIVE DESTINATION lib/static
PUBLIC_HEADER DESTINATION include
)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/matlab
DESTINATION interfaces
PATTERN "*.asv" EXCLUDE
PATTERN "*.pdf" EXCLUDE
)

# ____
# | _ \ ___ ___ ___
Expand Down Expand Up @@ -212,7 +217,7 @@ endif (BUILD_DOC AND DOXYGEN_FOUND)
# |_| \__,_|\___|_|\_\__,_|\__, |_|_| |_|\__, |
# __/ | __/ |
# |___/ |___/
set(CPACK_GENERATOR "STGZ;TGZ")
set(CPACK_GENERATOR "STGZ;TGZ;ZIP")
set(CPACK_PACKAGE_VERSION ${GIT_COMMIT_HASH})
set(CPACK_PACKAGE_NAME mightex1304-${CMAKE_BUILD_TYPE})
include(CPack)
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The project is ready for an easy cross-compilation. See README-xcomp.md for deta

### Windows

On Windows, things are a tad more complicated. For starters you need to install:
If you want to build the project on Windows, things are a tad more complicated. For starters you need to install:

1. Visual Studio 2019 (Community edition is fine), with Windows C++ SDK.
2. Git
Expand All @@ -48,4 +48,7 @@ cmake -Bbuild -S. -DBUILD_DOC=no -DCMAKE_BUILD_TYPE=Release
cmake --build build -j4 -t install
```

and you'll find all the goodies in `products_host`
and you'll find all the goodies in `products_host`.

If you only want to **use** the library on Windows, perhaps via Matlab, then you
need to download a release version of the library (in zip format) and also be sure to have installed the [Microsoft Viaual C++ Redistributable package](https://visualstudio.microsoft.com/downloads/). Also, remember to use the porper WinUSB driver as per the point 4. above.
4 changes: 2 additions & 2 deletions matlab/mightex.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
% Detailed explanation goes here

properties
Library {mustBeTextScalar} = '../products_host/lib/libmightex.so';
Header {mustBeTextScalar} = '../src/mightex1304.h';
Library {mustBeTextScalar} = '../../lib/libmightex.so';
Header {mustBeTextScalar} = '../../include/mightex1304.h';
end

properties (SetAccess = private, GetAccess = public)
Expand Down

0 comments on commit f795bba

Please sign in to comment.