Merge pull request #155 from xbmc/cmake/includeOrder

[cmake] prefer repo libs over depends libs

Author: garbear

.github/workflows/build.yml

@@ -1,54 +1,57 @@
-name: Build and run tests
+name: Build
 on: [push, pull_request]
 env:
   app_id: screensavers.rsxs
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-        - name: "Debian package test"
-          os: ubuntu-latest
-          CC: gcc
-          CXX: g++
-          DEBIAN_BUILD: true
+          - name: "GCC build"
+            CC: gcc
+            CXX: g++
+          - name: "Clang build"
+            CC: clang
+            CXX: clang++
     steps:
-    - name: Install needed ubuntu depends
-      env:
-        DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
+    - name: Install libgl-dev
       run: |
-        if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
-        if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
-        if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
+        sudo apt-get update -qq
+        sudo apt-get install -y libgl-dev
     - name: Checkout Kodi repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         repository: xbmc/xbmc
-        ref: master
+        ref: Omega
         path: xbmc
     - name: Checkout add-on repo
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         path: ${{ env.app_id }}
+    - name: Prepare
+      run: |
+        mkdir -p ${{ github.workspace }}/xbmc/cmake/addons/addons/${app_id}
+        echo ${app_id} ${{ github.workspace }}/${app_id} > ${{ github.workspace }}/xbmc/cmake/addons/addons/${app_id}/${app_id}.txt
     - name: Configure
       env:
         CC: ${{ matrix.CC }}
         CXX: ${{ matrix.CXX }}
-        DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
       run: |
-        if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir -p build && cd build; fi
-        if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=${{ github.workspace }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons -DPACKAGE_ZIP=1 ${{ github.workspace }}/xbmc/cmake/addons; fi
-        if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
-        if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep ${{ github.workspace }}/${app_id}; fi
+        cmake \
+          -B ${app_id}/build \
+          -DADDONS_TO_BUILD=${app_id} \
+          -DADDON_SRC_PREFIX=${{ github.workspace }} \
+          -DADDONS_DEFINITION_DIR=${{ github.workspace }}/xbmc/cmake/addons/addons \
+          -DCMAKE_BUILD_TYPE=Debug \
+          -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/xbmc/addons \
+          -DPACKAGE_ZIP=1 \
+          ${{ github.workspace }}/xbmc/cmake/addons
     - name: Build
       env:
         CC: ${{ matrix.CC }}
         CXX: ${{ matrix.CXX }}
-        DEBIAN_BUILD: ${{ matrix.DEBIAN_BUILD }}
       run: |
-        if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id}/build; fi
-        if [[ $DEBIAN_BUILD != true ]]; then make; fi
-        if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh ${{ github.workspace }}/${app_id}; fi
+        make -C ${app_id}/build -j$(getconf _NPROCESSORS_ONLN)

.travis.yml

@@ -19,10 +19,10 @@ else()
   add_definitions(${OPENGLES_DEFINITIONS})
 endif()
 
-include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
-                    ${PROJECT_SOURCE_DIR}/lib
+include_directories(${PROJECT_SOURCE_DIR}/lib/gli
                     ${PROJECT_SOURCE_DIR}/lib/glm
-                    ${PROJECT_SOURCE_DIR}/lib/gli)
+                    ${PROJECT_SOURCE_DIR}/lib
+                    ${KODI_INCLUDE_DIR}/..) # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
 
 add_subdirectory(lib/kodi/gui/gl)
 add_subdirectory(lib/Implicit)

CMakeLists.txt

@@ -41,14 +41,9 @@ jobs:
           WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
         ARM32-UWP:
           GENERATOR: "Visual Studio 17 2022"
-          ARCHITECTURE: ARM
+          ARCHITECTURE: ARM,version=10.0.17763.0
           CONFIGURATION: Release
           WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
-        #ARM64-UWP:
-        #  GENERATOR: "Visual Studio 17 2022"
-        #  ARCHITECTURE: ARM64
-        #  CONFIGURATION: Release
-        #  WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
 
     workspace:
       clean: all

azure-pipelines.yml

@@ -488,7 +488,7 @@ void CScreensaverHufoTunnel::InterLnCircle(double u, double v, double w, float *
   *y1 = w * v + d * u;
   *x2 = w * u + d * v;
   *y2 = w * v - d * u;
-#if defined(_DEBUG) && !defined(_WIN32)
+#if defined(_DEBUG) && !defined(_WIN32) && !defined(__ANDROID__) && !defined(__APPLE__)
   assert (abs ((*x1) * u + (*y1) * v - w) < 1e-6);
   assert (abs ((*x2) * u + (*y2) * v - w) < 1e-6);
   assert (abs (sqr (*x1) + sqr (*y1) - 1.0f) < 1e-6);