Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Sep 20, 2024
1 parent da6ad3c commit bf4d8ae
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
24 changes: 11 additions & 13 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
VSCP_ROOT: ${{github.workspace}}/vscp
QT_ROOT_DIR: /home/runner/work/vscp-works-qt/vscp-works-qt/qt/Qt/6.8.0
Qt6_DIR: /home/runner/work/vscp-works-qt/vscp-works-qt/qt/Qt/6.8.0/gcc_64/lib/cmake/Qt6/

jobs:
build:
Expand All @@ -26,7 +24,7 @@ jobs:
host: 'linux'
target: 'desktop'
arch: 'linux_gcc_64'
dir: ${{ github.workspace }}/qt/
#dir: ${{ github.workspace }}/qt/
modules: 'qtcharts qtconnectivity qtserialbus qtserialport qtwebsockets'

# https://github.com/actions/checkout
Expand All @@ -47,16 +45,16 @@ jobs:
export VSCP_ROOT=${{github.workspace}}/vscp
echo echo ${{env.VSCP_ROOT}}
- name: test
run: |
export Qt6_DIR=${{env.QT_ROOT_DIR}}/lib/cmake/Qt6/
echo $Qt6_DIR
echo $QT_ROOT_DIR
export TTT=${{env.QT_ROOT_DIR}}/lib/cmake/Qt6/
echo "${{env.TTT}}"
echo "Hello"
echo $TTT
echo $Qt6_DIR
# - name: test
# run: |
# export Qt6_DIR=${{env.QT_ROOT_DIR}}/lib/cmake/Qt6/
# echo $Qt6_DIR
# echo $QT_ROOT_DIR
# export TTT=${{env.QT_ROOT_DIR}}/lib/cmake/Qt6/
# echo "${{env.TTT}}"
# echo "Hello"
# echo $TTT
# echo $Qt6_DIR

- name: Checkout eclipse paho repo
uses: actions/checkout@v4
Expand Down
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# --- System Libraries ---
include(GNUInstallDirs)

# Include Qt basic functions
include(QtCommon)

# Added extensions for curl lib find
list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".a")

Expand Down

0 comments on commit bf4d8ae

Please sign in to comment.