fix(ci): PATH on macOS

Project-LemonLime · Dec 13, 2020 · 8e76458 · 8e76458
1 parent 48373fb
commit 8e76458
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/macos-qt6.yml b/.github/workflows/macos-qt6.yml
@@ -54,7 +54,7 @@ jobs:
           brew install ninja pkg-config
       - name: build macos
         env:
-          Qt5_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
+          Qt6_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
         run: |
           cmake . \
             -GNinja \
@@ -67,11 +67,11 @@ jobs:
       # tag 打包
       - name: package
         env:
-          Qt5_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
+          Qt6_DIR: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}}
         run: |
           # 拷贝依赖
           #mv ${targetName} ${targetName}.app
-          export PATH=$Qt5_DIR/bin:$PATH
+          export PATH=$Qt6_DIR/bin:$PATH
           macdeployqt ${targetName}.app -qmldir=. -verbose=1 -dmg
       - name: Upload artifact
         uses: actions/upload-artifact@v2-preview

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -248,7 +248,7 @@ endif()
 
 target_include_directories(lemon PUBLIC ${CMAKE_SOURCE_DIR}/src)
 
-if(WIN32 AND ENABLE_XLS_EXPORT NOT LEMON_QT6)
+if(WIN32 AND ENABLE_XLS_EXPORT AND NOT LEMON_QT6)
     find_package(${LEMON_QT_LIBNAME} COMPONENTS AxContainer REQUIRED)
     list(APPEND LEMON_QT_LIBS ${LEMON_QT_LIBNAME}::AxContainer)
     add_definitions(-DENABLE_XLS_EXPORT)

diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
@@ -1 +1 @@
-110
+113