Skip to content

Commit 12f2f0a

Browse files
committed
Enabled flat namespace in macOS github workflows.
1 parent 05043da commit 12f2f0a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/cmake.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ jobs:
7575
cmake -B build
7676
-D CMAKE_C_COMPILER="gcc-11"
7777
-D CMAKE_Fortran_COMPILER="gfortran-11"
78+
-D USE_FLAT_NAMESPACE:BOOL=ON
7879
7980
# - name: Use Unix Makefiles on Windows
8081
# if: ${{ matrix.os == 'windows-latest' }}

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ matrix:
2929
- os: osx
3030
name: "CMake Release Test on macOS Big Sur"
3131
osx_image: xcode12.3
32-
env:
33-
- CMAKE_BUILD_TYPE=Release
34-
- ADDITIONAL_CMAKE_OPTIONS="-DUSE_FLAT_NAMESPACE:BOOL=ON"
32+
env: CMAKE_BUILD_TYPE=Release
3533
- os: osx
3634
osx_image: xcode12.3
3735
name: "Makefile Test on on macOS Big Sur"
@@ -64,7 +62,6 @@ script:
6462
-DBUILD_SHARED_LIBS:BOOL=ON
6563
-DCMAKE_Fortran_FLAGS:STRING="-fimplicit-none -frecursive -fcheck=all"
6664
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
67-
${ADDITIONAL_CMAKE_OPTIONS}
6865
${SRC_DIR}
6966
- ctest -D ExperimentalStart
7067
- ctest -D ExperimentalConfigure

0 commit comments

Comments
 (0)