From 12115ffa7240a6d42b9bb3b0ee891583a4ab6b52 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sat, 23 Nov 2019 19:43:34 +0100 Subject: [PATCH] Cleanup and fixes --- CMakeLists.txt | 5 +++++ clients/CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ca5cb4c..8694ff63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,9 @@ endif() # Export the compile_commands.json file 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 if (UNIX) add_compile_options(-Wall) @@ -34,6 +37,8 @@ add_subdirectory(external/abseil-cpp EXCLUDE_FROM_ALL) # Add the static library targets and sources add_subdirectory(src) +# Optional targets + if (SFIZZ_CLIENTS) add_subdirectory(clients) endif() diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index ee4e41f2..784064f7 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -3,8 +3,8 @@ project(sfizz) ############################### add_executable(sfzprint sfzprint.cpp) 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) target_link_libraries(sfizz_jack sfizz::sfizz jack absl::flags_parse) -install(TARGETS sfizz_jack DESTINATION . OPTIONAL) \ No newline at end of file +# install(TARGETS sfizz_jack DESTINATION . OPTIONAL) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe37b34b..dcc2a37a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,7 +64,7 @@ add_library(sfizz::sfizz ALIAS sfizz) # Shared library and installation target 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) target_link_libraries(sfizz_shared sfizz::sfizz) configure_file(${CMAKE_SOURCE_DIR}/scripts/sfizz.pc.in sfizz.pc @ONLY)