try qnx-ports

bradh352 · Dec 12, 2024 · 6d7e633 · 6d7e633
1 parent 9ccd9c4
commit 6d7e633
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/.github/workflows/qnx.yml b/.github/workflows/qnx.yml
@@ -45,22 +45,23 @@ jobs:
           cp -r ~/.qnx/license ${{ github.workspace }}/.qnx
           echo "Downloading QNX SDP ..."
           ${{ github.workspace }}/qnxinstall/qnxsoftwarecenter/qnxsoftwarecenter_clt -mirror -cleanInstall -destination ${{ github.workspace }}/qnx800 -installBaseline com.qnx.qnx800 -myqnx.user="$QNX_USER" -myqnx.password="$QNX_PASSWORD"
-      - name: Checkout googletest
-        uses: actions/checkout@v4
-        with:
-          repository: qnx-ports/googletest
-          path: googletest
       - name: Set CMAKE_FIND_ROOT_PATH
         run: |
           source "${{ github.workspace }}/qnx800/qnxsdp-env.sh"
           echo "CMAKE_FIND_ROOT_PATH=${QNX_TARGET};${QNX_TARGET}/${CPUVARDIR}" >> $GITHUB_ENV
+      - name: Checkout qnx-ports build-files
+        uses: actions/checkout@v4
+          with:
+            path: build-files
+      - name: Checkout qnx-ports googletest
+        uses: actions/checkout@v4
+        with:
+          repository: qnx-ports/googletest
+          path: googletest
       - name: Build googletest
         run: |
           source "${{ github.workspace }}/qnx800/qnxsdp-env.sh"
-          cd googletest
-          cmake -DCMAKE_SYSTEM_NAME=QNX -DCMAKE_INSTALL_PREFIX=${QNX_TARGET}/${CPUVARDIR}/usr -DCMAKE_INSTALL_INCLUDEDIR=${QNX_TARGET}/usr/include -DCMAKE_FIND_ROOT_PATH="${CMAKE_FIND_ROOT_PATH}" -DBUILD_GMOCK=ON -DINSTALL_GTEST=ON -Dgtest_disable_pthreads=ON -DCMAKE_VERBOSE_MAKEFILE=ON .
-          gmake
-          gmake install
+          PREFIX="/usr" BUILD_TESTING="OFF" QNX_PROJECT_ROOT="$(pwd)/googletest" make -C build-files/ports/googletest install -j$(nproc)
       - name: Checkout c-ares
         uses: actions/checkout@v4
         with:
@@ -75,8 +76,6 @@ jobs:
           ./ci/build.sh
       - name: "Autotools: build c-ares"
         env:
-          CC: qcc
-          CXX: q++
           BUILD_TYPE: autotools
         run: |
           source "${{ github.workspace }}/qnx800/qnxsdp-env.sh"