Skip to content
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

Jump to bottom

Typo #338

Merged
merged 5 commits into from
Aug 14, 2024
Merged

Typo #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
27e897a
Typo
pariterre Aug 14, 2024
09fb952
to remove
pariterre Aug 14, 2024
02ef46f
Fixed matlab github actions
pariterre Aug 14, 2024
cd8af9b
Removed all the shinanigans
pariterre Aug 14, 2024
ba8e91d
Trying something for macos-arm64
pariterre Aug 14, 2024
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
9 changes: 8 additions & 1 deletion .github/workflows/publish_matlab_binaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
cache: true
if: matrix.label != 'osx-arm64'

- name: Install MATLAB on MACOS-arm64
- name: Install MATLAB on MACOS-Arm64
uses: matlab-actions/setup-matlab@v2
with:
release: R2023a
Expand Down Expand Up @@ -94,6 +94,13 @@ jobs:
cd $MAIN_FOLDER
if: matrix.label == 'win-64'

- name: Do some shinanigans on MACOS-ARM64
run: |
# Since Github actions arm64 provides the wrong "uname -m", we change it by hand
cd $HOME/ezc3d_matlab
for old in *.mexmaci64; do mv $old `basename $old .mexmaci64`.mexmaca64; done
cd $MAIN_FOLDER

- name: Build MATLAB archives on UNIX
run: |
cp -r $HOME/ezc3d_matlab .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_matlab_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
cache: true
if: matrix.label != 'osx-arm64'

- name: Install MATLAB on MACOS
- name: Install MATLAB on MACOS-Arm64
uses: matlab-actions/setup-matlab@v2
with:
release: R2023a
Expand All @@ -80,7 +80,7 @@ jobs:
make install -j${{ steps.cpu-cores.outputs.count }}
cd $MAIN_FOLDER
if: matrix.label != 'win-64'

- name: Build ezc3d on WINDOWS
run: |
MAIN_FOLDER=`pwd`
Expand Down
12 changes: 3 additions & 9 deletions binding/matlab/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,41 +42,35 @@ foreach(SUFFIXES Read Write)
# Set the name of the library
if(WIN32)
if (CMAKE_CL_64)
message(STATUS "Using MATLAB for Windows 64-bits")
set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
SUFFIX ".mexw64"
)
else(CMAKE_CL_64)
message(STATUS "Using MATLAB for Windows 32-bits")
set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
SUFFIX ".mexw32"
)
endif(CMAKE_CL_64)
elseif(APPLE)
if (CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "x86_64")
message(STATUS "Using MATLAB for MacOS Intel")
if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
SUFFIX ".mexmaci64"
PREFIX ""
)
elseif(CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64")
message(STATUS "Using MATLAB for MacOS Arm")
elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
SUFFIX ".mexmaca64"
PREFIX ""
)
else()
message(FATAL_ERROR "Unknown architecture: ${CMAKE_SYSTEM_PROCESSOR}")
message(FATAL_ERROR "Unknown architecture: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
endif ()
else()
if (CMAKE_SIZEOF_VOID_P MATCHES "8")
message(STATUS "Using MATLAB for Linux 64-bits")
set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
SUFFIX ".mexa64"
PREFIX ""
)
else(CMAKE_SIZEOF_VOID_P MATCHES "8")
message(STATUS "Using MATLAB for Linux 32-bits")
set_target_properties(${PROJECT_NAME}_${SUFFIXES} PROPERTIES
SUFFIX ".mexglx"
PREFIX ""
Expand Down
Loading