Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove C++/C 23 until officially released #277

Merged
merged 5 commits into from
Sep 11, 2024
Merged

fix: remove C++/C 23 until officially released #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c8b3f73
fix: remove C++/C 23 until officially released
aminya Sep 10, 2024
599cd25
ci: install cmakelang for cmake-lint/format
aminya Sep 10, 2024
9c59e3c
test: remove LTO workaround for apple LLVM
aminya Sep 10, 2024
d46a234
ci: use the pre-installed cmake on macos-14
aminya Sep 10, 2024
7b663ef
ci: disable MacOS 14 for now [skip ci]
aminya Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@ jobs:
- windows-2022
- ubuntu-22.04
- macos-13
- macos-14
# - macos-14
compiler:
- llvm
- gcc
cmake:
- true
vcvarsall:
- true
include:
- os: "windows-2022"
compiler: "msvc"
cmake: true
vcvarsall: true
- os: "windows-2022"
compiler: "msvc"
Expand All @@ -55,7 +52,7 @@ jobs:
${{ env.XDG_CACHE_HOME }}/vcpkg/archives
${{ env.LOCALAPPDATA }}\vcpkg\archives
${{ env.APPDATA }}\vcpkg\archives
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}-${{ matrix.cmake }}
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}
restore-keys: |
${{ runner.os }}-${{ env.BUILD_TYPE }}-

Expand All @@ -64,7 +61,7 @@ jobs:
with:
compiler: ${{ matrix.compiler }}
vcvarsall: ${{ contains(matrix.os, 'windows') && matrix.vcvarsall }}
cmake: ${{ matrix.cmake }}
cmake: true
ninja: true
vcpkg: true
conan: 2.6.0
Expand All @@ -83,6 +80,5 @@ jobs:

- name: Lint
run: |
pipx install cmakelint
pipx install --include-deps cmake-format
pipx install cmakelang[YAML]
task lint
4 changes: 2 additions & 2 deletions src/Standards.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ macro(set_standards)
_set_language_standard(
CXX_LATEST_STANDARD
CXX
23
# 23
20
17
14
Expand All @@ -39,7 +39,7 @@ macro(set_standards)
_set_language_standard(
C_LATEST_STANDARD
C
23
# 23
20
17
11
Expand Down
11 changes: 0 additions & 11 deletions tests/install/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@ if(FEATURE_TESTS)
)
endif()

set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "ENABLE_INTERPROCEDURAL_OPTIMIZATION")
if(APPLE)
detect_macos_version(apple_version)
if(apple_version VERSION_GREATER_EQUAL 13)
# workaround for linkage error as described in https://github.com/Homebrew/homebrew-core/issues/145991
# although fixed, this problem still exists in github actions
add_link_options(-Wl,-ld_classic)
set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "")
endif()
endif()

# Initialize project_options
project_options(
ENABLE_CACHE
Expand Down
11 changes: 0 additions & 11 deletions tests/myproj/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,6 @@ if(NOT MSVC)
#message(STATUS "Detect Linker: ${LINKER}")
endif()

set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "ENABLE_INTERPROCEDURAL_OPTIMIZATION")
if(APPLE)
detect_macos_version(apple_version)
if(apple_version VERSION_GREATER_EQUAL 13)
# workaround for linkage error as described in https://github.com/Homebrew/homebrew-core/issues/145991
# although fixed, this problem still exists in github actions
add_link_options(-Wl,-ld_classic)
set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "")
endif()
endif()

# Initialize project_options
# uncomment the options to enable them
project_options(
Expand Down