Skip to content

Commit

Permalink
hack
Browse files Browse the repository at this point in the history
  • Loading branch information
MatusGuy committed Jan 28, 2025
1 parent 7777a9f commit f1eff3d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/gnulinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ jobs:
- name: Configure build
env:
BUILD_TYPE: ${{ matrix.build_type }}
ARCH: ${{ matrix.arch == 32 && '-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32' || '' }}
ARCH: ${{ matrix.arch == 32 && '-m32' || '' }}
MAKE_DOCS: ${{ matrix.documentation }}
GLBINDING: ${{ matrix.glbinding }}
TESTS: ${{ matrix.os == 'ubuntu-20.04' }}
Expand All @@ -166,10 +166,14 @@ jobs:
$CXX --version
mkdir "build"
cd "build"
# FIXME I'm not sure what's going on but for some reason we need to
# add the CXX_STANDARD flags manually
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $ARCH \
-DWARNINGS=ON -DWERROR=ON \
-DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_DOCUMENTATION=$MAKE_DOCS -DENABLE_DISCORD=ON
-DBUILD_DOCUMENTATION=$MAKE_DOCS -DENABLE_DISCORD=ON \
-DCMAKE_CXX_FLAGS="$ARCH -std=c++17" -DCMAKE_C_FLAGS="$ARCH"
- name: Build and install
working-directory: build
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
# Stop CMake from whining about 3.5 or future versions that other FindXXXXX.cmake files (seen from vcpkg) use
set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)

set_target_properties
if(${PLATFORM} MATCHES "arm64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_ARM64_ /DMY_CPU_LE")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D_ARM64_ /DMY_CPU_LE")
Expand Down

0 comments on commit f1eff3d

Please sign in to comment.