From 2f83ed1fc34bb124a2591d44a94c31f520abca09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 13 Jan 2019 21:43:56 +0100 Subject: [PATCH] particle/dynlist: compile as a shared library --- CMakeLists.txt | 2 -- modules/CMakeLists.txt | 4 ++-- particles/CMakeLists.txt | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c39e6a..b567e37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,6 @@ add_executable(f00bar tag.c tag.h xcb.c xcb.h yml.c yml.h - - particles/dynlist.c particles/dynlist.h ) # Make global symbols in f00bar visible to dlopen:ed plugins diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 2e4209f..5fa03c1 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -31,7 +31,7 @@ pkg_check_modules(JSON REQUIRED json-c) add_library(i3 MODULE i3.c) target_compile_options(i3 PRIVATE ${JSON_CFLAGS_OTHER}) target_include_directories(i3 PRIVATE ${JSON_INCLUDE_DIRS}) -target_link_libraries(i3 module-sdk ${JSON_LIBRARIES}) +target_link_libraries(i3 module-sdk dynlist ${JSON_LIBRARIES}) add_library(label MODULE label.c) target_link_libraries(label module-sdk) @@ -48,7 +48,7 @@ target_link_libraries(network module-sdk) add_library(removables MODULE removables.c) target_compile_options(removables PRIVATE ${UDEV_CFLAGS_OTHER}) target_include_directories(removables PRIVATE ${UDEV_INCLUDE_DIRS}) -target_link_libraries(removables module-sdk ${UDEV_LIBRARIES}) +target_link_libraries(removables module-sdk dynlist ${UDEV_LIBRARIES}) pkg_check_modules(XCB_XKB REQUIRED xcb-xkb) add_library(xkb MODULE xkb.c) diff --git a/particles/CMakeLists.txt b/particles/CMakeLists.txt index f588b8b..9dca01a 100644 --- a/particles/CMakeLists.txt +++ b/particles/CMakeLists.txt @@ -4,6 +4,9 @@ add_library(particle-sdk INTERFACE) target_compile_options(particle-sdk INTERFACE ${CAIRO_CFLAGS_OTHER}) target_include_directories(particle-sdk INTERFACE ${CAIRO_INCLUDE_DIRS}) +add_library(dynlist SHARED dynlist.c dynlist.h) +target_link_libraries(dynlist particle-sdk) + set(CMAKE_SHARED_MODULE_PREFIX particle_) add_library(empty MODULE empty.c) @@ -33,4 +36,6 @@ install( ramp string + dynlist + DESTINATION lib/f00bar)