Bugfix/llvm9 dependency (#4)

* bugfix: 删除libclang * bugfix: 删除libclang * bugfix: libclang-11-dev
Kingtous · Apr 26, 2021 · 1a9fe15 · 1a9fe15
1 parent f02b18a
commit 1a9fe15
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Installing LLVM 11
-      run: sudo apt remove -y llvm-9-dev llvm-9-doc llvm-9 llvm-9-runtime llvm-9-tools libclang-dev && sudo apt install -y llvm-11-dev libclang-11-dev
+      run: sudo apt remove -y llvm-9-* libclang-9* && sudo apt install -y llvm-11-dev libclang-11-dev
 
     - name: Installing libedit
       run: sudo apt install -y libedit-dev
@@ -57,7 +57,7 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . -- -j 6
+      run: cmake --build .
 
     - name: Create Release
       id: create_release

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.13)
 project(sysyplus_compiler)
 
 set(CMAKE_CXX_STANDARD 17)
+# 始终选择最高版本依赖
+SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
+SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 
 find_package(LLVM REQUIRED CONFIG)
 include_directories(${LLVM_INCLUDE_DIRS})

diff --git a/module/sql/CMakeLists.txt b/module/sql/CMakeLists.txt
@@ -1,9 +1,6 @@
 cmake_minimum_required(VERSION 3.13)
 project(KingtousProject)
 set(CMAKE_CXX_STANDARD 17)
-# 始终选择最高版本依赖
-SET(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL)
-SET(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
 
 message(STATUS ${CMAKE_SOURCE_DIR})
 set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/obj/unknown)