Skip to content

Commit

Permalink
Merge pull request #64 from MatthieuHernandez/Fix_clang
Browse files Browse the repository at this point in the history
Fix clang under Windows compilation
  • Loading branch information
MatthieuHernandez authored Nov 7, 2024
2 parents d610ab3 + 77fc77a commit b93fe01
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/dataset_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,9 @@ on:
jobs:
unit-tests:
name: Build and run
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Set up GCC
uses: egor-tensin/setup-gcc@v1.3
with:
version: 13
platform: x64
- name: Checkout projet
uses: actions/checkout@v2
- name: Checkout datasets
Expand All @@ -29,7 +24,7 @@ jobs:
- name: CMake
run: |
cd ./build
CXX=/usr/bin/g++-13 cmake -G"Unix Makefiles" ./.. -DCMAKE_BUILD_TYPE=Release
CC=/usr/bin/gcc-14 CXX=/usr/bin/g++-14 cmake -G"Unix Makefiles" ./.. -DCMAKE_BUILD_TYPE=Release
- name: make
run: |
cd ./build
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ if(MSVC)
else()
set(CMAKE_CXX_FLAGS_DEBUG "-g")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math")
if(WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_ALL_NO_LIB -fms-runtime-lib=static")
endif()
endif()

add_subdirectory(src)
Expand All @@ -64,4 +67,5 @@ if(MSVC)
else()
target_compile_options(StraightforwardNeuralNetwork PUBLIC -fopenmp -Wall -Wextra -pedantic -Werror -Wno-unused-parameter)
target_compile_options(Boost INTERFACE -w)
target_compile_options(gtest INTERFACE -w)
endif()

0 comments on commit b93fe01

Please sign in to comment.