Update efsw to 1.4.0 (#649)

* Update efsw to 1.4.0 * Use llvm 18.1.5 on windows * set path for clang * Use llvm 18.1.5 on windows * Remove windows clang-cl build from CI * trigger CI
polserver · Jun 9, 2024 · 4e8b3bf · 4e8b3bf
1 parent d916f86
commit 4e8b3bf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/buildwinnopch.yml b/.github/workflows/buildwinnopch.yml
@@ -17,14 +17,14 @@ jobs:
             nopch: 1
             ninja: 1
             name: CL Ninja
-          - os: "windows-latest"
-            cxx-compiler: clang-cl
-            c-compiler: clang-cl
-            compiler-version: default
-            build-type: Release
-            nopch: 1
-            ninja: 1
-            name: Clang Ninja
+          # - os: "windows-latest"
+          #   cxx-compiler: clang-cl
+          #   c-compiler: clang-cl
+          #   compiler-version: default
+          #   build-type: Release
+          #   nopch: 1
+          #   ninja: 1
+          #   name: Clang Ninja
           - os: "windows-latest"
             cxx-compiler: cl
             c-compiler: cl
@@ -33,14 +33,14 @@ jobs:
             nopch: 1
             ninja: 0
             name: CL msbuild
-          - os: "windows-latest"
-            cxx-compiler: clang-cl
-            c-compiler: clang-cl
-            compiler-version: default
-            build-type: Debug
-            nopch: 1
-            ninja: 0
-            name: Clang msbuild
+          # - os: "windows-latest"
+          #   cxx-compiler: clang-cl
+          #   c-compiler: clang-cl
+          #   compiler-version: default
+          #   build-type: Debug
+          #   nopch: 1
+          #   ninja: 0
+          #   name: Clang msbuild
 
     runs-on: ${{ matrix.config.os }}
 
@@ -74,8 +74,8 @@ jobs:
         run: |
           iwr -useb get.scoop.sh -outfile 'install.ps1'
           .\install.ps1 -RunAsAdmin
-          scoop install llvm --global
-          #echo "::set-env name=PATH::$env:PATH"
+          scoop install llvm@18.1.5 --global
+          echo "$env:PATH" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Force
 
       - name: Set CXX and CC
         shell: pwsh

diff --git a/cmake/Efsw.cmake b/cmake/Efsw.cmake
@@ -1,7 +1,7 @@
 message("* libefsw")
 
 set (EFSW_REPOSITORY "https://github.com/SpartanJ/efsw.git")
-set (EFSW_VERSION_REF "3419347")
+set (EFSW_VERSION_REF "1.4.0")
 
 set (EFSW_SOURCE_DIR "${POL_EXT_LIB_DIR}/efsw-${EFSW_VERSION_REF}")
 set (EFSW_INSTALL_DIR "${EFSW_SOURCE_DIR}/build")