Skip to content

Commit 9208630

Browse files
Merge pull request #344 from Nelson-numerical-software/macos-build-fix
fix macos build due to last brew update
2 parents 1cb0eb9 + 23afd6c commit 9208630

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

.github/workflows/ccpp.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,6 @@ jobs:
5151
brew install eigen
5252
brew install libomp
5353
export BUILD_ROOT=$(pwd);
54-
git clone https://github.com/live-clones/hdf5.git /tmp/hdf5-1_10_5;
55-
cd /tmp/hdf5-1_10_5;
56-
git checkout hdf5-1_10_5;
57-
./configure --quiet --prefix=/usr/local --enable-shared --disable-deprecated-symbols --disable-hl --disable-strict-format-checks --disable-memory-alloc-sanity-check --disable-instrument --disable-parallel --disable-trace --disable-asserts --with-pic --with-default-api-version=v110 CFLAGS="-w"
58-
sudo make install -C src
59-
git clone https://github.com/tbeu/matio /tmp/matio
60-
cd /tmp/matio
61-
git checkout v1.5.16
62-
cd /tmp/matio
63-
./autogen.sh;
64-
./configure --enable-shared --enable-mat73=yes --enable-extended-sparse=no --with-pic --with-hdf5=/usr/local
65-
make;
66-
sudo make install;
6754
cd /Users/runner/work/nelson;
6855
git clone https://github.com/Nelson-numerical-software/nelson-thirdparty-macosx.git;
6956
cd nelson-thirdparty-macosx;

modules/f2c/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ set(module_library_name nlsF2C)
2727
# ==============================================================================
2828
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/include)
2929
# ==============================================================================
30-
add_definitions(-DINTEGER_STAR_8)
30+
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
3131
add_definitions(-D_POSIX_SOURCE)
32+
endif()
33+
add_definitions(-DINTEGER_STAR_8)
3234
add_definitions(-DNO_My_ctype)
3335
add_definitions(-DSkip_f2c_Undefs)
3436
# ==============================================================================

0 commit comments

Comments
 (0)