Skip to content

Commit fe5a166

Browse files
authored
Merge pull request #277 from aminya/reomve-c++-23
2 parents a32b008 + 7b663ef commit fe5a166

File tree

4 files changed

+6
-32
lines changed

4 files changed

+6
-32
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,15 @@ jobs:
1717
- windows-2022
1818
- ubuntu-22.04
1919
- macos-13
20-
- macos-14
20+
# - macos-14
2121
compiler:
2222
- llvm
2323
- gcc
24-
cmake:
25-
- true
2624
vcvarsall:
2725
- true
2826
include:
2927
- os: "windows-2022"
3028
compiler: "msvc"
31-
cmake: true
3229
vcvarsall: true
3330
- os: "windows-2022"
3431
compiler: "msvc"
@@ -55,7 +52,7 @@ jobs:
5552
${{ env.XDG_CACHE_HOME }}/vcpkg/archives
5653
${{ env.LOCALAPPDATA }}\vcpkg\archives
5754
${{ env.APPDATA }}\vcpkg\archives
58-
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}-${{ matrix.cmake }}
55+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}
5956
restore-keys: |
6057
${{ runner.os }}-${{ env.BUILD_TYPE }}-
6158
@@ -64,7 +61,7 @@ jobs:
6461
with:
6562
compiler: ${{ matrix.compiler }}
6663
vcvarsall: ${{ contains(matrix.os, 'windows') && matrix.vcvarsall }}
67-
cmake: ${{ matrix.cmake }}
64+
cmake: true
6865
ninja: true
6966
vcpkg: true
7067
conan: 2.6.0
@@ -83,6 +80,5 @@ jobs:
8380

8481
- name: Lint
8582
run: |
86-
pipx install cmakelint
87-
pipx install --include-deps cmake-format
83+
pipx install cmakelang[YAML]
8884
task lint

src/Standards.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ macro(set_standards)
2222
_set_language_standard(
2323
CXX_LATEST_STANDARD
2424
CXX
25-
23
25+
# 23
2626
20
2727
17
2828
14
@@ -39,7 +39,7 @@ macro(set_standards)
3939
_set_language_standard(
4040
C_LATEST_STANDARD
4141
C
42-
23
42+
# 23
4343
20
4444
17
4545
11

tests/install/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@ if(FEATURE_TESTS)
1717
)
1818
endif()
1919

20-
set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "ENABLE_INTERPROCEDURAL_OPTIMIZATION")
21-
if(APPLE)
22-
detect_macos_version(apple_version)
23-
if(apple_version VERSION_GREATER_EQUAL 13)
24-
# workaround for linkage error as described in https://github.com/Homebrew/homebrew-core/issues/145991
25-
# although fixed, this problem still exists in github actions
26-
add_link_options(-Wl,-ld_classic)
27-
set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "")
28-
endif()
29-
endif()
30-
3120
# Initialize project_options
3221
project_options(
3322
ENABLE_CACHE

tests/myproj/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,6 @@ if(NOT MSVC)
4949
#message(STATUS "Detect Linker: ${LINKER}")
5050
endif()
5151

52-
set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "ENABLE_INTERPROCEDURAL_OPTIMIZATION")
53-
if(APPLE)
54-
detect_macos_version(apple_version)
55-
if(apple_version VERSION_GREATER_EQUAL 13)
56-
# workaround for linkage error as described in https://github.com/Homebrew/homebrew-core/issues/145991
57-
# although fixed, this problem still exists in github actions
58-
add_link_options(-Wl,-ld_classic)
59-
set(ENABLE_INTERPROCEDURAL_OPTIMIZATION "")
60-
endif()
61-
endif()
62-
6352
# Initialize project_options
6453
# uncomment the options to enable them
6554
project_options(

0 commit comments

Comments
 (0)