From fd8865d0d048cc4b03adb7422a5cd67b5e33ba0a Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 25 Jan 2017 14:50:04 -0200 Subject: cmake: EFL_OPTION() now supports DEPENDS to handle conditionals. This is now used by ENABLE_SYSTEMD and ENABLE_VALGRIND, which moves to "common.cmake" since they are shared among multiple libraries. With that I found that LINK_FLAGS is indeed a string, not a CMake List (space separated, not ";"), then fix that so compilation actually works. --- src/lib/eina/CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/lib/eina') diff --git a/src/lib/eina/CMakeLists.txt b/src/lib/eina/CMakeLists.txt index dabbabf756..33234700fe 100644 --- a/src/lib/eina/CMakeLists.txt +++ b/src/lib/eina/CMakeLists.txt @@ -1,5 +1,12 @@ set(DESCRIPTION "A Library that implements fast data types and miscellaneous tools") -set(PKG_CONFIG_REQUIRES_PRIVATE OPTIONAL libsystemd) + +if(ENABLE_SYSTEMD) + list(APPEND PKG_CONFIG_REQUIRES_PRIVATE libsystemd) +endif() + +if(ENABLE_VALGRIND) + list(APPEND PKG_CONFIG_REQUIRES_PRIVATE valgrind) +endif() set(PUBLIC_LIBRARIES pthread @@ -11,10 +18,6 @@ set(LIBRARIES rt ) -if(ENABLE_VALGRIND) - list(APPEND PKG_CONFIG_REQUIRES_PRIVATE valgrind) -endif() - set(PUBLIC_HEADERS Eina.h eina_accessor.h -- cgit v1.2.1