Skip to content

Commit

Permalink
Fixing compiler option and adding macOS compiling
Browse files Browse the repository at this point in the history
  • Loading branch information
Bocchio01 committed Mar 5, 2024
1 parent 1dfab8b commit 7756235
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 24 deletions.
23 changes: 4 additions & 19 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
name: CMake on multiple platforms

on:
Expand All @@ -13,17 +11,9 @@ jobs:
runs-on: ${{ matrix.os }}

strategy:
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
fail-fast: false

# Set up a matrix to run the following 3 configurations:
# 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
# 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
# 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
#
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
build_type: [Release]
c_compiler: [gcc, clang, cl]
include:
Expand All @@ -36,6 +26,9 @@ jobs:
- os: ubuntu-latest
c_compiler: clang
cpp_compiler: clang++
- os: macos-latest
c_compiler: clang
cpp_compiler: clang++
exclude:
- os: windows-latest
c_compiler: gcc
Expand All @@ -48,28 +41,20 @@ jobs:
- uses: actions/checkout@v3

- name: Set reusable strings
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
id: strings
shell: bash
run: |
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: >
cmake -B ${{ steps.strings.outputs.build-output-dir }}
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-S ${{ github.workspace }}
- name: Build
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}

- name: Test
working-directory: ${{ steps.strings.outputs.build-output-dir }}
# Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest --build-config ${{ matrix.build_type }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Here is an example of how to run the code with the default parameters:

### Plot the results

You can plot the results using the `MATLAB` script provided in the `sim_output/plotting` folder.
You can plot the results using the `MATLAB` script provided in the `sim_plotting` folder.

## Trouble shooting

Expand Down
2 changes: 1 addition & 1 deletion libs/cFILE/cFILE.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ bool FILE_Read(cFILE_t *file)
return true;
}

bool FILE_Write(cFILE_t *file, mode_t mode)
bool FILE_Write(cFILE_t *file, cFILE_opening_mode_t mode)
{
char full_path[100] = {0};

Expand Down
4 changes: 2 additions & 2 deletions libs/cFILE/cFILE.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ typedef enum
{
WRITE = 'w',
APPEND = 'a'
} mode_t;
} cFILE_opening_mode_t;

typedef struct
{
Expand All @@ -34,7 +34,7 @@ void FILE_Free(cFILE_t *file);

bool FILE_Read(cFILE_t *file);

bool FILE_Write(cFILE_t *file, mode_t mode);
bool FILE_Write(cFILE_t *file, cFILE_opening_mode_t mode);

char *FILE_Extension_to_String(extension_t extension);

Expand Down
2 changes: 1 addition & 1 deletion libs/cGETOPT/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(MSVC)
endif()

if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
target_compile_options(-w)
target_compile_options(${PROJECT_NAME} PRIVATE -w)
elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
target_compile_options(${PROJECT_NAME} PRIVATE /w)
endif()
Expand Down

0 comments on commit 7756235

Please sign in to comment.