From f150f91a167340ec6d56910ae10fd849d1edc750 Mon Sep 17 00:00:00 2001
From: withmorten <morten.with@gmail.com>
Date: Tue, 17 Aug 2021 23:29:20 +0200
Subject: [PATCH] fix cmake build

---
 .appveyor.yml                           | 8 ++++----
 .github/workflows/build-cmake-conan.yml | 4 ++--
 CMakeLists.txt                          | 4 ++--
 conanfile.py                            | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index f74fc38..2fc79b2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,11 +1,11 @@
 image: Visual Studio 2017
 configuration: Release
 environment:
-  GLFW_BASE: glfw-3.3.4.bin.WIN64
-  GLFW_URL: https://github.com/glfw/glfw/releases/download/3.3.4/%GLFW_BASE%.zip
-  SDL2_BASE: SDL2-devel-2.0.14-VC
+  GLFW_BASE: glfw-3.2.1.bin.WIN64
+  GLFW_URL: https://github.com/glfw/glfw/releases/download/3.2.1/%GLFW_BASE%.zip
+  SDL2_BASE: SDL2-devel-2.0.8-VC
   SDL2_URL: https://www.libsdl.org/release/%SDL2_BASE%.zip
-  SDL2_DIRAME: SDL2-2.0.14
+  SDL2_DIRAME: SDL2-2.0.8
   PREMAKE5_URL: https://github.com/premake/premake-core/releases/download/v5.0.0-alpha16/premake-5.0.0-alpha16-windows.zip
   matrix:
   - PLATFORM: win-amd64-null
diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml
index 43f85a9..1619bfe 100644
--- a/.github/workflows/build-cmake-conan.yml
+++ b/.github/workflows/build-cmake-conan.yml
@@ -8,11 +8,11 @@ jobs:
   build-cmake:
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [windows-latest, ubuntu-18.04, macos-latest]
         platform: ['null', 'gl3', 'd3d9']
         gl3_gfxlib: ['glfw', 'sdl2']
         exclude:
-          - os: ubuntu-latest
+          - os: ubuntu-18.04
             platform: d3d9
           - os: macos-latest
             platform: d3d9
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0d44ee..6a49c28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,8 +65,8 @@ endif()
 
 add_subdirectory(src)
 
-if(NOT LIBRW_PLATFORM_PS2 AND NOT LIBRW_PLATFORM_NULL)
-    add_subdirectory(skeleton)
+if(LIBRW_TOOLS AND NOT LIBRW_PLATFORM_PS2 AND NOT LIBRW_PLATFORM_NULL)
+   add_subdirectory(skeleton)
 endif()
 
 add_subdirectory(tools)
diff --git a/conanfile.py b/conanfile.py
index 4cefb49..5e1fae4 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -108,7 +108,7 @@ class LibrwConan(ConanFile):
         env = {}
         cmake.definitions["LIBRW_PLATFORM"] = self._librw_platform
         cmake.definitions["LIBRW_INSTALL"] = True
-        cmake.definitions["LIBRW_TOOLS"] = True
+        cmake.definitions["LIBRW_TOOLS"] = False
         if self.options.platform == "gl3":
             cmake.definitions["LIBRW_GL3_GFXLIB"] = str(self.options.gl3_gfxlib).upper()
         if self._os_is_playstation2: