SDK/CMake updates

Daft-Freak · Feb 10, 2021 · f8cbddb · f8cbddb
1 parent 0130ba3
commit f8cbddb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -19,7 +19,7 @@ jobs:
 #          - os: ubuntu-20.04
 #            name: Linux
 #            release-suffix: LIN64
-#            cmake-args: -D32BLIT_PATH=$GITHUB_WORKSPACE/32blit/
+#            cmake-args: -D32BLIT_DIR=$GITHUB_WORKSPACE/32blit/
 #            apt-packages: libsdl2-dev libsdl2-image-dev python3-setuptools
 
           - os: ubuntu-20.04
@@ -40,7 +40,7 @@ jobs:
     - name: Checkout 32blit
       uses: actions/checkout@master
       with:
-        repository: pimoroni/32blit-beta
+        repository: 32blit/32blit-sdk
         path: 32blit
 
     # Linux deps

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,9 @@
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.9.0)
 project(doom)
-set(32BLIT_PATH "../" CACHE PATH "Path to 32blit.cmake")
 
 option(EMBED_ASSET_WAD "Embed a WAD at build time as an asset" OFF)
 
-include(${32BLIT_PATH}/32blit.cmake)
+find_package (32BLIT CONFIG REQUIRED PATHS ../32blit-sdk)
 
 set(DOOM_SOURCES
     src/chocdoom/dummy.c