improvements to noinstall

Author: newdigate

.github/workflows/ubuntu_x64_cmake.yml

@@ -18,6 +18,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: download dependencies
+        run: sudo apt-get update && sudo apt-get install -yq libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
+
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
         # We'll use this as our working directory for all subsequent commands

Dependencies.CMake.in

@@ -1,14 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-#********** CMAKE DECLARE AND FETCH MACRO ******
-include(FetchContent)
-FetchContent_Declare(cmake_declare_and_fetch
-        GIT_REPOSITORY https://github.com/newdigate/cmake-declare-and-fetch.git
-        GIT_TAG        main
-)
-FetchContent_MakeAvailable(cmake_declare_and_fetch)
-include("${FETCHCONTENT_BASE_DIR}/cmake_declare_and_fetch-src/DeclareAndFetchCMake.in")
-#********** CMAKE DECLARE AND FETCH MACRO ******
+include(cmake_declare_and_fetch.cmake.in)
 
 DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git noinstall src)
 DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git noinstall src)

cmake_declare_and_fetch.cmake.in

@@ -0,0 +1,7 @@
+include(FetchContent)
+FetchContent_Declare(cmake_declare_and_fetch
+        GIT_REPOSITORY https://github.com/newdigate/cmake-declare-and-fetch.git
+        GIT_TAG        main
+)
+FetchContent_MakeAvailable(cmake_declare_and_fetch)
+include("${FETCHCONTENT_BASE_DIR}/cmake_declare_and_fetch-src/DeclareAndFetchCMake.in")

extras/opengl/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(teensy_st7735_linux_extras_opengl CXX)
-
+include(../../cmake_declare_and_fetch.cmake.in)
 set(CMAKE_CXX_STANDARD 11)
 
 add_subdirectory(src)