Skip to content

Commit 57bd1fa

Browse files
newdigatenewdigate
authored
Merge pull request #4 from newdigate/noinstall
Noinstall
2 parents 5fef4c9 + 3808c58 commit 57bd1fa

24 files changed

+160
-499
lines changed

‎.github/workflows/basic_example.yml

+3-49
Original file line numberDiff line numberDiff line change
@@ -17,54 +17,8 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-x86-sd-stubs
28-
path: teensy-x86-sd-stubs
29-
30-
- uses: actions/checkout@v2
31-
with:
32-
repository: newdigate/teensy-gfx
33-
path: teensy-gfx
34-
35-
- uses: actions/checkout@v2
36-
with:
37-
repository: newdigate/teensy-x86-bounce2-stubs
38-
path: teensy-x86-bounce2-stubs
39-
40-
- uses: actions/checkout@v2
41-
with:
42-
repository: newdigate/teensy-x86-encoder-stubs
43-
path: teensy-x86-encoder-stubs
44-
4520
- name: download dependencies
46-
run: sudo apt-get update && sudo apt-get install -yq libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
47-
48-
- name: Make and Install teensy-x86-stubs
49-
run: cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
50-
51-
- name: Make and Install teensy-gfx
52-
run: cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
53-
54-
- name: Make and Install teensy-x86-sd-stubs
55-
run: cd teensy-x86-sd-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
56-
57-
- name: Make and Install st7735
58-
run: mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
59-
60-
- name: Make and Install st7735_opengl
61-
run: cd extras/opengl && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
62-
63-
- name: Make and Install teensy-x86-bounce2-stubs
64-
run: cd teensy-x86-bounce2-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
65-
66-
- name: Make and Install teensy-x86-encoder-stubs
67-
run: cd teensy-x86-encoder-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
21+
run: sudo apt-get update && sudo apt-get install -yq libfreetype-dev libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
6822

6923
- name: Create Build Environment
7024
# Some projects don't allow in-source building, so create a separate build directory
@@ -79,10 +33,10 @@ jobs:
7933
# Note the current convention is to use the -S and -B options here to specify source
8034
# and build directories, but this is only available with CMake 3.13 and higher.
8135
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
82-
run: cmake $GITHUB_WORKSPACE/extras/opengl/examples/basic -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
8337

8438
- name: Build
8539
working-directory: ${{github.workspace}}/build
8640
shell: bash
8741
# Execute the build. You can specify a specific target with "--target <NAME>"
88-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target basic --config $BUILD_TYPE

‎.github/workflows/scrolltest_example.yml

+3-34
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,8 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-x86-sd-stubs
28-
path: teensy-x86-sd-stubs
29-
30-
- uses: actions/checkout@v2
31-
with:
32-
repository: newdigate/teensy-gfx
33-
path: teensy-gfx
34-
3520
- name: download dependencies
36-
run: sudo apt-get update && sudo apt-get install -yq libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
37-
38-
- name: Make and Install teensy-x86-stubs
39-
run: cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
40-
41-
- name: Make and Install teensy-gfx
42-
run: |
43-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
44-
45-
- name: Make and Install teensy-x86-sd-stubs
46-
run: cd teensy-x86-sd-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
47-
48-
- name: Make and Install st7735
49-
run: mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
50-
51-
- name: Make and Install st7735_opengl
52-
run: cd extras/opengl && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
21+
run: sudo apt-get update && sudo apt-get install -yq libfreetype-dev libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
5322

5423
- name: Create Build Environment
5524
# Some projects don't allow in-source building, so create a separate build directory
@@ -64,10 +33,10 @@ jobs:
6433
# Note the current convention is to use the -S and -B options here to specify source
6534
# and build directories, but this is only available with CMake 3.13 and higher.
6635
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
67-
run: cmake $GITHUB_WORKSPACE/extras/opengl/examples/scrolltest -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
6837

6938
- name: Build
7039
working-directory: ${{github.workspace}}/build
7140
shell: bash
7241
# Execute the build. You can specify a specific target with "--target <NAME>"
73-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target scrolltest --config $BUILD_TYPE

‎.github/workflows/spitftbitmap_example.yml

+3-34
Original file line numberDiff line numberDiff line change
@@ -17,39 +17,8 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-x86-sd-stubs
28-
path: teensy-x86-sd-stubs
29-
30-
- uses: actions/checkout@v2
31-
with:
32-
repository: newdigate/teensy-gfx
33-
path: teensy-gfx
34-
3520
- name: download dependencies
36-
run: sudo apt-get update && sudo apt-get install -yq libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev libboost-test-dev
37-
38-
- name: Make and Install teensy-x86-stubs
39-
run: cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
40-
41-
- name: Make and Install teensy-x86-sd-stubs
42-
run: cd teensy-x86-sd-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
43-
44-
- name: Make and Install teensy-gfx
45-
run: |
46-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
47-
48-
- name: Make and Install st7735
49-
run: mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
50-
51-
- name: Make and Install st7735_opengl
52-
run: cd extras/opengl && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
21+
run: sudo apt-get update && sudo apt-get install -yq libfreetype-dev libboost-test-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev libboost-test-dev
5322

5423
- name: Create Build Environment
5524
# Some projects don't allow in-source building, so create a separate build directory
@@ -64,10 +33,10 @@ jobs:
6433
# Note the current convention is to use the -S and -B options here to specify source
6534
# and build directories, but this is only available with CMake 3.13 and higher.
6635
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
67-
run: cmake $GITHUB_WORKSPACE/extras/opengl/examples/spitftbitmap -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
6837

6938
- name: Build
7039
working-directory: ${{github.workspace}}/build
7140
shell: bash
7241
# Execute the build. You can specify a specific target with "--target <NAME>"
73-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target spitftbitmap --config $BUILD_TYPE

‎.github/workflows/ubuntu-opengl.yml

+2-20
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,9 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v2
1919

20-
- uses: actions/checkout@v2
21-
with:
22-
repository: newdigate/teensy-x86-stubs
23-
path: teensy-x86-stubs
24-
25-
- uses: actions/checkout@v2
26-
with:
27-
repository: newdigate/teensy-gfx
28-
path: teensy-gfx
29-
3020
- name: download dependencies
3121
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
3222

33-
- name: Make and Install teensy-x86-stubs
34-
run: |
35-
cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
36-
37-
- name: Make and Install teensy-gfx
38-
run: |
39-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
40-
4123
- name: Create Build Environment
4224
# Some projects don't allow in-source building, so create a separate build directory
4325
# We'll use this as our working directory for all subsequent commands
@@ -51,10 +33,10 @@ jobs:
5133
# Note the current convention is to use the -S and -B options here to specify source
5234
# and build directories, but this is only available with CMake 3.13 and higher.
5335
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
54-
run: cmake $GITHUB_WORKSPACE/extras/opengl/src -DCMAKE_BUILD_TYPE=$BUILD_TYPE
36+
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
5537

5638
- name: Build
5739
working-directory: ${{github.workspace}}/build
5840
shell: bash
5941
# Execute the build. You can specify a specific target with "--target <NAME>"
60-
run: cmake --build . --config $BUILD_TYPE
42+
run: cmake --build . --target teensy_st7735_linux_opengl --config $BUILD_TYPE

‎.github/workflows/ubuntu_x64_cmake.yml

+2-17
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,8 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020

21-
- uses: actions/checkout@v2
22-
with:
23-
repository: newdigate/teensy-x86-stubs
24-
path: teensy-x86-stubs
25-
26-
- uses: actions/checkout@v2
27-
with:
28-
repository: newdigate/teensy-gfx
29-
path: teensy-gfx
30-
31-
- name: Make and Install Dependencies
32-
run: |
33-
cd teensy-x86-stubs && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
34-
35-
- name: Make and Install teensy-gfx
36-
run: |
37-
cd teensy-gfx && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
21+
- name: download dependencies
22+
run: sudo apt-get update && sudo apt-get install -yq libfreetype-dev libglfw3 libglfw3-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libx11-dev libxmu-dev libxi-dev libgl-dev libglew-dev
3823

3924
- name: Create Build Environment
4025
# Some projects don't allow in-source building, so create a separate build directory

‎CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@ project(teensy_st7735_linux CXX)
33

44
set(CMAKE_CXX_STANDARD 17)
55

6+
include(cmake_declare_and_fetch.cmake.in)
7+
add_definitions(-DBUILD_FOR_LINUX)
8+
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git main src)
9+
DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git main src)
10+
611
add_subdirectory(src)
12+
add_subdirectory(extras/opengl)

‎cmake/teensy_st7735_linux_stubs.cmake.in

-9
This file was deleted.

‎cmake/uninstall.cmake

-24
This file was deleted.

‎cmake_declare_and_fetch.cmake.in

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
include(FetchContent)
2+
FetchContent_Declare(cmake_declare_and_fetch
3+
GIT_REPOSITORY https://github.com/newdigate/cmake-declare-and-fetch.git
4+
GIT_TAG main
5+
)
6+
FetchContent_MakeAvailable(cmake_declare_and_fetch)
7+
include("${FETCHCONTENT_BASE_DIR}/cmake_declare_and_fetch-src/DeclareAndFetchCMake.in")

‎extras/opengl/CMakeLists.txt

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
cmake_minimum_required(VERSION 3.5)
22
project(teensy_st7735_linux_extras_opengl CXX)
3+
include(../../cmake_declare_and_fetch.cmake.in)
4+
set(CMAKE_CXX_STANDARD 17)
35

4-
set(CMAKE_CXX_STANDARD 11)
6+
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git main src)
7+
DeclareAndFetch(teensy_x86_sd_stubs https://github.com/newdigate/teensy-x86-sd-stubs.git main src)
8+
DeclareAndFetch(teensy_gfx https://github.com/newdigate/teensy-gfx.git main src)
9+
DeclareAndFetch(teensy_x86_encoder_stubs https://github.com/newdigate/teensy-x86-encoder-stubs.git noinstall src)
10+
DeclareAndFetch(teensy_x86_bounce2_stubs https://github.com/newdigate/teensy-x86-bounce2-stubs.git main src)
511

6-
add_subdirectory(src)
12+
include(opengl.cmake.in)
13+
14+
add_subdirectory(src)
15+
add_subdirectory(examples)

‎extras/opengl/common.cmake.in

-17
This file was deleted.

‎extras/opengl/examples/basic/CMakeLists.txt

+7-22
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,20 @@ project(teensy_st7735_linux_extras_opengl_examples_basic C CXX)
33

44
set(CMAKE_CXX_STANDARD 17)
55

6-
find_package(teensy_x86_stubs)
7-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
8-
9-
find_package(teensy_x86_encoder_stubs)
10-
include_directories(${teensy_x86_encoder_stubs_INCLUDE_DIR})
11-
12-
find_package(teensy_x86_bounce2_stubs)
13-
include_directories(${teensy_x86_bounce2_stubs_INCLUDE_DIR})
14-
15-
find_package(teensy_gfx)
16-
include_directories(${teensy_gfx_INCLUDE_DIR})
17-
18-
find_package(teensy_st7735_linux_stubs)
19-
include_directories(${teensy_st7735_linux_stubs_INCLUDE_DIR})
20-
216
include_directories(../../src)
227

238
add_definitions(-fms-extensions)
249
add_definitions(-DArduino=146)
2510

2611
add_executable(basic graphicstest.cpp)
2712

28-
target_link_libraries(basic ${teensy_x86_stubs_LIBS})
29-
target_link_libraries(basic ${teensy_x86_sd_stubs_LIBS})
30-
target_link_libraries(basic ${teensy_x86_bounce2_stubs_LIBS})
31-
target_link_libraries(basic ${teensy_x86_encoder_stubs_LIBS})
32-
target_link_libraries(basic ${teensy_gfx_LIBS})
33-
target_link_libraries(basic ${teensy_st7735_linux_stubs_LIBS})
34-
target_link_libraries(basic ${teensy_st7735_linux_extras_opengl_LIBS})
13+
target_link_libraries(basic teensy_x86_stubs)
14+
target_link_libraries(basic teensy_x86_sd_stubs)
15+
target_link_libraries(basic teensy_x86_bounce2_stubs)
16+
target_link_libraries(basic teensy_x86_encoder_stubs)
17+
target_link_libraries(basic teensy_gfx)
18+
target_link_libraries(basic teensy_st7735_linux_stubs)
19+
target_link_libraries(basic teensy_st7735_linux_opengl)
3520

3621
include(../../opengl.cmake.in)
3722
target_link_libraries(basic ${LIBS})

0 commit comments

Comments
 (0)