-
-
Notifications
You must be signed in to change notification settings - Fork 54
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[cmake] Refactoring, fix options and issues with cxx standard
- Loading branch information
Showing
5 changed files
with
165 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
|
|
||
| add_executable(midiobserve examples/midiobserve.cpp) | ||
| target_link_libraries(midiobserve PRIVATE libremidi) | ||
|
|
||
| add_executable(echo examples/echo.cpp) | ||
| target_link_libraries(echo PRIVATE libremidi) | ||
|
|
||
| add_executable(cmidiin examples/cmidiin.cpp) | ||
| target_link_libraries(cmidiin PRIVATE libremidi) | ||
|
|
||
| add_executable(midiclock_in examples/midiclock_in.cpp) | ||
| target_link_libraries(midiclock_in PRIVATE libremidi) | ||
|
|
||
| add_executable(midiclock_out examples/midiclock_out.cpp) | ||
| target_link_libraries(midiclock_out PRIVATE libremidi) | ||
|
|
||
| add_executable(midiout examples/midiout.cpp) | ||
| target_link_libraries(midiout PRIVATE libremidi) | ||
|
|
||
| if(HAS_STD_JTHREAD) | ||
| add_executable(multithread_midiout examples/multithread_midiout.cpp) | ||
| target_link_libraries(multithread_midiout PRIVATE libremidi) | ||
| endif() | ||
|
|
||
| add_executable(midiclient examples/client.cpp) | ||
| target_link_libraries(midiclient PRIVATE libremidi) | ||
|
|
||
| add_executable(midiprobe examples/midiprobe.cpp) | ||
| target_link_libraries(midiprobe PRIVATE libremidi) | ||
|
|
||
| add_executable(qmidiin examples/qmidiin.cpp) | ||
| target_link_libraries(qmidiin PRIVATE libremidi) | ||
|
|
||
| add_executable(sysextest examples/sysextest.cpp) | ||
| target_link_libraries(sysextest PRIVATE libremidi) | ||
|
|
||
| add_executable(midi2_echo examples/midi2_echo.cpp) | ||
| target_link_libraries(midi2_echo PRIVATE libremidi) | ||
|
|
||
| if(NOT LIBREMIDI_NO_ALSA) | ||
| add_executable(poll_share examples/poll_share.cpp) | ||
| target_link_libraries(poll_share PRIVATE libremidi) | ||
| add_executable(alsa_share examples/alsa_share.cpp) | ||
| target_link_libraries(alsa_share PRIVATE libremidi) | ||
| endif() | ||
|
|
||
| if(NOT LIBREMIDI_NO_JACK) | ||
| add_executable(jack_share examples/jack_share.cpp) | ||
| target_link_libraries(jack_share PRIVATE libremidi) | ||
| endif() | ||
|
|
||
| if(APPLE) | ||
| add_executable(coremidi_share examples/coremidi_share.cpp) | ||
| target_link_libraries(coremidi_share PRIVATE libremidi) | ||
| endif() | ||
|
|
||
| if(EMSCRIPTEN) | ||
| add_executable(emscripten_midiin examples/emscripten_midiin.cpp) | ||
| target_link_libraries(emscripten_midiin PRIVATE libremidi) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| if(NOT LIBREMIDI_HEADER_ONLY) | ||
| install(TARGETS libremidi | ||
| EXPORT libremidi-targets | ||
| ARCHIVE DESTINATION lib/static | ||
| RUNTIME DESTINATION bin | ||
| LIBRARY DESTINATION lib | ||
| ) | ||
| else() | ||
| install(TARGETS libremidi | ||
| EXPORT libremidi-targets | ||
| ) | ||
| endif() | ||
| install(EXPORT libremidi-targets | ||
| DESTINATION lib/cmake/libremidi) | ||
| install(DIRECTORY include | ||
| DESTINATION .) | ||
| export(EXPORT libremidi-targets) | ||
|
|
||
| include(CMakePackageConfigHelpers) | ||
|
|
||
| # generate the config file that includes the exports | ||
| configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/libremidi-config.cmake.in | ||
| "${CMAKE_CURRENT_BINARY_DIR}/libremidi-config.cmake" | ||
| INSTALL_DESTINATION "lib/cmake/libremidi" | ||
| NO_SET_AND_CHECK_MACRO | ||
| NO_CHECK_REQUIRED_COMPONENTS_MACRO | ||
| ) | ||
|
|
||
| write_basic_package_version_file( | ||
| "${CMAKE_CURRENT_BINARY_DIR}/libremidi-config-version.cmake" | ||
| VERSION "${CMAKE_PROJECT_VERSION}" | ||
| COMPATIBILITY AnyNewerVersion | ||
| ) | ||
|
|
||
| install(FILES | ||
| ${CMAKE_CURRENT_BINARY_DIR}/libremidi-config.cmake | ||
| ${CMAKE_CURRENT_BINARY_DIR}/libremidi-config-version.cmake | ||
| DESTINATION lib/cmake/libremidi | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
|
|
||
| include(FetchContent) | ||
|
|
||
| FetchContent_Declare( | ||
| Catch2 | ||
| GIT_REPOSITORY https://github.com/catchorg/Catch2.git | ||
| GIT_TAG v3.4.0 | ||
| ) | ||
|
|
||
| FetchContent_MakeAvailable(Catch2) | ||
| if(NOT TARGET Catch2::Catch2WithMain) | ||
| message(WARNING "libremidi: Catch2::Catch2WithMain target not found") | ||
| return() | ||
| endif() | ||
|
|
||
| message(STATUS "libremidi: compiling tests") | ||
| if(LIBREMIDI_CI) | ||
| target_compile_definitions(libremidi ${_public} LIBREMIDI_CI) | ||
| endif() | ||
|
|
||
| add_executable(midiin_test tests/unit/midi_in.cpp) | ||
| target_link_libraries(midiin_test PRIVATE libremidi Catch2::Catch2WithMain) | ||
|
|
||
| add_executable(midiout_test tests/unit/midi_out.cpp) | ||
| target_link_libraries(midiout_test PRIVATE libremidi Catch2::Catch2WithMain) | ||
|
|
||
| add_executable(midifile_read_test tests/unit/midifile_read.cpp) | ||
| target_link_libraries(midifile_read_test PRIVATE libremidi Catch2::Catch2WithMain) | ||
| target_compile_definitions(midifile_read_test PRIVATE "LIBREMIDI_TEST_CORPUS=\"${CMAKE_CURRENT_SOURCE_DIR}/tests/corpus\"") | ||
|
|
||
| add_executable(midifile_write_test tests/unit/midifile_write.cpp) | ||
| target_link_libraries(midifile_write_test PRIVATE libremidi Catch2::Catch2WithMain) | ||
| target_compile_definitions(midifile_write_test PRIVATE "LIBREMIDI_TEST_CORPUS=\"${CMAKE_CURRENT_SOURCE_DIR}/tests/corpus\"") | ||
|
|
||
| add_executable(midifile_write_tracks_test tests/integration/midifile_write_tracks.cpp) | ||
| target_link_libraries(midifile_write_tracks_test PRIVATE libremidi Catch2::Catch2WithMain) | ||
|
|
||
| include(CTest) | ||
| add_test(NAME midiin_test COMMAND midiin_test) | ||
| add_test(NAME midiout_test COMMAND midiout_test) | ||
| add_test(NAME midifile_read_test COMMAND midifile_read_test) | ||
| add_test(NAME midifile_write_test COMMAND midifile_write_test) | ||
| add_test(NAME midifile_write_tracks_test COMMAND midifile_write_tracks_test) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| #include <libremidi/libremidi.hpp> | ||
|
|
||
| #include <iostream> | ||
| #include <mutex> | ||
| #include <thread> | ||
| #include <vector> | ||
|
|
||