From c8b3f73746520e238c8d3b8d4a5e26a722935c26 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 10 Sep 2024 15:39:05 -0700 Subject: [PATCH 1/5] fix: remove C++/C 23 until officially released --- src/Standards.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Standards.cmake b/src/Standards.cmake index 819a9904..b66547d6 100644 --- a/src/Standards.cmake +++ b/src/Standards.cmake @@ -22,7 +22,7 @@ macro(set_standards) _set_language_standard( CXX_LATEST_STANDARD CXX - 23 + # 23 20 17 14 @@ -39,7 +39,7 @@ macro(set_standards) _set_language_standard( C_LATEST_STANDARD C - 23 + # 23 20 17 11 From 599cd25ec934787862a32bdbd8b1bde72b410d84 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 10 Sep 2024 15:55:07 -0700 Subject: [PATCH 2/5] ci: install cmakelang for cmake-lint/format --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3149f67a..a09e62a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,6 +83,5 @@ jobs: - name: Lint run: | - pipx install cmakelint - pipx install --include-deps cmake-format + pipx install cmakelang[YAML] task lint From 9c59e3c3f73768ceb6977fdbc1242aef023264b6 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 10 Sep 2024 15:55:28 -0700 Subject: [PATCH 3/5] test: remove LTO workaround for apple LLVM --- tests/install/CMakeLists.txt | 11 ----------- tests/myproj/CMakeLists.txt | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/tests/install/CMakeLists.txt b/tests/install/CMakeLists.txt index 8983ce29..b8c37c51 100644 --- a/tests/install/CMakeLists.txt +++ b/tests/install/CMakeLists.txt @@ -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 diff --git a/tests/myproj/CMakeLists.txt b/tests/myproj/CMakeLists.txt index 121b1430..281cccf5 100644 --- a/tests/myproj/CMakeLists.txt +++ b/tests/myproj/CMakeLists.txt @@ -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( From d46a23427fcc1bd06515c3e9c2aa54fbaf389088 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 10 Sep 2024 16:07:15 -0700 Subject: [PATCH 4/5] ci: use the pre-installed cmake on macos-14 --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a09e62a5..04508ff1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,14 +21,11 @@ jobs: compiler: - llvm - gcc - cmake: - - true vcvarsall: - true include: - os: "windows-2022" compiler: "msvc" - cmake: true vcvarsall: true - os: "windows-2022" compiler: "msvc" @@ -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 }}- @@ -64,7 +61,7 @@ jobs: with: compiler: ${{ matrix.compiler }} vcvarsall: ${{ contains(matrix.os, 'windows') && matrix.vcvarsall }} - cmake: ${{ matrix.cmake }} + cmake: ${{ !contains(matrix.os, 'macos-14') }} ninja: true vcpkg: true conan: 2.6.0 From 7b663ef460072b504c7e88674a1da38e8c774b45 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 10 Sep 2024 17:21:44 -0700 Subject: [PATCH 5/5] ci: disable MacOS 14 for now [skip ci] --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04508ff1..40b74d2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - windows-2022 - ubuntu-22.04 - macos-13 - - macos-14 + # - macos-14 compiler: - llvm - gcc @@ -61,7 +61,7 @@ jobs: with: compiler: ${{ matrix.compiler }} vcvarsall: ${{ contains(matrix.os, 'windows') && matrix.vcvarsall }} - cmake: ${{ !contains(matrix.os, 'macos-14') }} + cmake: true ninja: true vcpkg: true conan: 2.6.0