sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup and fixes

Browse source
This commit is contained in:
Paul Ferrand 2019-11-23 19:43:34 +01:00
parent 21bb69e41b
commit 12115ffa72
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -9,6 +9,9 @@ endif()
# Export the compile_commands.json file # Export the compile_commands.json file
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Only install what's explicitely said
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
# Add required flags for the builds # Add required flags for the builds
if (UNIX) if (UNIX)
add_compile_options(-Wall) add_compile_options(-Wall)
@ -34,6 +37,8 @@ add_subdirectory(external/abseil-cpp EXCLUDE_FROM_ALL)
# Add the static library targets and sources # Add the static library targets and sources
add_subdirectory(src) add_subdirectory(src)
# Optional targets
if (SFIZZ_CLIENTS) if (SFIZZ_CLIENTS)
add_subdirectory(clients) add_subdirectory(clients)
endif() endif()

4
clients/CMakeLists.txt
View file

@ -3,8 +3,8 @@ project(sfizz)
############################### ###############################
add_executable(sfzprint sfzprint.cpp) add_executable(sfzprint sfzprint.cpp)
target_link_libraries(sfzprint sfizz::parser absl::flags_parse) target_link_libraries(sfzprint sfizz::parser absl::flags_parse)
install(TARGETS sfzprint DESTINATION . OPTIONAL) # install(TARGETS sfzprint DESTINATION . OPTIONAL)
add_executable(sfizz_jack jack_client.cpp) add_executable(sfizz_jack jack_client.cpp)
target_link_libraries(sfizz_jack sfizz::sfizz jack absl::flags_parse) target_link_libraries(sfizz_jack sfizz::sfizz jack absl::flags_parse)
install(TARGETS sfizz_jack DESTINATION . OPTIONAL) # install(TARGETS sfizz_jack DESTINATION . OPTIONAL)

2
src/CMakeLists.txt
View file

@ -64,7 +64,7 @@ add_library(sfizz::sfizz ALIAS sfizz)
# Shared library and installation target # Shared library and installation target
if (SFIZZ_SHARED) if (SFIZZ_SHARED)
add_library(sfizz_shared SHARED sfizz/sfizz_wrapper.cpp) add_library(sfizz_shared SHARED sfizz.h)
set_target_properties(sfizz_shared PROPERTIES OUTPUT_NAME sfizz PUBLIC_HEADER sfizz.h) set_target_properties(sfizz_shared PROPERTIES OUTPUT_NAME sfizz PUBLIC_HEADER sfizz.h)
target_link_libraries(sfizz_shared sfizz::sfizz) target_link_libraries(sfizz_shared sfizz::sfizz)
configure_file(${CMAKE_SOURCE_DIR}/scripts/sfizz.pc.in sfizz.pc @ONLY) configure_file(${CMAKE_SOURCE_DIR}/scripts/sfizz.pc.in sfizz.pc @ONLY)