Skip to content

Commit 75ed9b3

Browse files
newdigatenewdigate
committed
noinstall
1 parent 746393e commit 75ed9b3

File tree

5 files changed

+26
-95
lines changed

5 files changed

+26
-95
lines changed

‎.github/workflows/ubuntu_x64_cmake.yml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,9 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v2
2626

27-
- uses: actions/checkout@v2
28-
with:
29-
repository: newdigate/teensy-x86-stubs
30-
path: teensy-x86-stubs
31-
32-
- uses: actions/checkout@v2
33-
with:
34-
repository: newdigate/teensy-audio-x86-stubs
35-
path: teensy-audio-x86-stubs
36-
37-
- uses: actions/checkout@v2
38-
with:
39-
repository: newdigate/teensy-x86-sd-stubs
40-
path: teensy-x86-sd-stubs
41-
4227
- name: download dependencies
4328
run: sudo apt-get update && sudo apt-get install -yq libboost-test-dev libsoundio-dev libxml2-utils xsltproc
4429

45-
- name: Make and Install teensy-x86-stubs
46-
run: cd teensy-x86-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 teensy-x86-sd-stubs
49-
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
50-
51-
- name: Make and Install teensy-audio-x86-stubs
52-
run: cd teensy-audio-x86-stubs/src && 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-audio-x86-stubs-soundio
55-
run: cd teensy-audio-x86-stubs/extras/soundio/src && mkdir cmake-build-$BUILD_TYPE && cd cmake-build-$BUILD_TYPE && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && sudo make install
56-
5730
- name: Create Build Environment
5831
# Some projects don't allow in-source building, so create a separate build directory
5932
# We'll use this as our working directory for all subsequent commands

‎CMakeLists.txt‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,24 @@ if (NOT DEFINED BUILD_FOR_LINUX)
1919
add_subdirectory(src)
2020
add_subdirectory(examples)
2121
else()
22+
23+
include(cmake_declare_and_fetch.cmake.in)
24+
DeclareAndFetch(teensy_x86_stubs https://github.com/newdigate/teensy-x86-stubs.git noinstall src)
25+
DeclareAndFetch(teensy_x86_sd_stubs https://github.com/newdigate/teensy-x86-sd-stubs noinstall src)
26+
DeclareAndFetch(teensy_audio_x86_stubs https://github.com/newdigate/teensy-audio-x86-stubs noinstall src)
2227
add_subdirectory(src)
2328
add_subdirectory(test)
24-
#add_subdirectory(extras/soundio/playqueue)
25-
add_subdirectory(extras/soundio/save_raw)
26-
add_subdirectory(extras/soundio/save_raw_sd)
27-
add_subdirectory(extras/soundio/save_wav)
28-
add_subdirectory(extras/soundio/sd_play_all)
29-
add_subdirectory(extras/linux/array)
30-
add_subdirectory(extras/linux/sd_raw)
29+
30+
if (DEFINED BUILD_SOUNDIO_EXAMPLES)
31+
find_library(LIB_soundio soundio)
32+
if (LIB_soundio)
33+
#add_subdirectory(extras/soundio/playqueue)
34+
add_subdirectory(extras/soundio/save_raw)
35+
add_subdirectory(extras/soundio/save_raw_sd)
36+
add_subdirectory(extras/soundio/save_wav)
37+
add_subdirectory(extras/soundio/sd_play_all)
38+
add_subdirectory(extras/linux/array)
39+
add_subdirectory(extras/linux/sd_raw)
40+
endif ()
41+
endif ()
3142
endif()

‎cmake_declare_and_fetch.cmake.in‎

Lines changed: 7 additions & 0 deletions
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")

‎src/CMakeLists.linux.cmake.in‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,4 @@
1-
message("building for linux...")
2-
add_definitions(-DBUILD_FOR_LINUX)
3-
4-
set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/teensy_variable_playback/)
5-
set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib/teensy_variable_playback )
6-
7-
find_package(teensy_x86_stubs)
8-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
9-
10-
find_package(teensy_audio_x86_stubs)
11-
include_directories(${teensy_audio_x86_stubs_INCLUDE_DIR})
12-
13-
find_package(teensy_x86_sd_stubs)
14-
include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
15-
161
add_library(teensy_variable_playback STATIC
172
${HEADER_FILES}
18-
${SOURCE_FILES}
19-
)
20-
21-
set_target_properties(teensy_variable_playback PROPERTIES PUBLIC_HEADER "${HEADER_FILES}")
22-
set_target_properties(teensy_variable_playback PROPERTIES LINKER_LANGUAGE C)
23-
24-
include(CMakePackageConfigHelpers)
25-
configure_package_config_file(../cmake/teensy_variable_playback.cmake.in
26-
${CMAKE_CURRENT_BINARY_DIR}/teensy_variable_playbackConfig.cmake
27-
INSTALL_DESTINATION ${LIB_INSTALL_DIR}/teensy_variable_playback/cmake
28-
PATH_VARS)
29-
30-
write_basic_package_version_file(
31-
${CMAKE_CURRENT_BINARY_DIR}/teensy_variable_playbackConfigVersion.cmake
32-
VERSION ${teensy_variable_playback_VERSION}
33-
COMPATIBILITY SameMajorVersion )
34-
35-
install(TARGETS teensy_variable_playback DESTINATION
36-
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
37-
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
38-
PUBLIC_HEADER DESTINATION "include/teensy_variable_playback"
39-
)
40-
41-
install(FILES
42-
${CMAKE_CURRENT_BINARY_DIR}/teensy_variable_playbackConfig.cmake
43-
${CMAKE_CURRENT_BINARY_DIR}/teensy_variable_playbackConfigVersion.cmake
44-
${CMAKE_CURRENT_SOURCE_DIR}/../cmake/uninstall.cmake
45-
DESTINATION "lib/cmake/teensy_variable_playback" )
3+
${SOURCE_FILES})
464

47-
##
48-
# copied from: https://gist.github.com/royvandam/3033428
49-
# Add uninstall target
50-
# Requirements: Copy the uninstall.cmake file to the appropriate CMAKE_MODULE_PATH.
51-
add_custom_target(uninstall
52-
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/uninstall.cmake")

‎test/CMakeLists.txt‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ if (DEFINED BUILD_FOR_LINUX)
88
find_package (Boost REQUIRED COMPONENTS unit_test_framework)
99
include_directories (${Boost_INCLUDE_DIRS})
1010

11-
find_package(teensy_x86_stubs)
12-
include_directories(${teensy_x86_stubs_INCLUDE_DIR})
13-
message(STATUS "include-dir: teensy_x86_stubs: ${teensy_x86_stubs_INCLUDE_DIR}")
14-
15-
find_package(teensy_audio_x86_stubs)
16-
include_directories(${teensy_audio_x86_stubs_INCLUDE_DIR})
17-
message(STATUS "include-dir: teensy_audio_x86_stubs: ${teensy_audio_x86_stubs_INCLUDE_DIR}")
18-
19-
find_package(teensy_x86_sd_stubs)
20-
include_directories(${teensy_x86_sd_stubs_INCLUDE_DIR})
21-
message(STATUS "include-dir: teensy_x86_sd_stubs: ${teensy_x86_sd_stubs_INCLUDE_DIR}")
22-
2311
include_directories(.)
2412
include_directories(../src)
2513
include_directories(../test/audio)

0 commit comments

Comments
 (0)