celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [2/2] celix git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/celix into develop
Date Tue, 06 Feb 2018 16:04:06 GMT
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/celix into develop


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/06bcd4ec
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/06bcd4ec
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/06bcd4ec

Branch: refs/heads/develop
Commit: 06bcd4ece12ba4e4de35a186bb4a2b8c5fd6bdb7
Parents: 5a0e5ed ac36f55
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Feb 6 17:03:51 2018 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Feb 6 17:03:51 2018 +0100

----------------------------------------------------------------------
 etcdlib/CMakeLists.txt      |  2 +
 etcdlib/src/etcd.c          |  1 -
 etcdlib/test/etcdlib_test.c | 98 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/06bcd4ec/etcdlib/CMakeLists.txt
----------------------------------------------------------------------
diff --cc etcdlib/CMakeLists.txt
index ccb6621,8c64858..195eaf7
--- a/etcdlib/CMakeLists.txt
+++ b/etcdlib/CMakeLists.txt
@@@ -71,15 -72,16 +71,17 @@@ target_include_directories(etcdlib_stat
      ${JANSSON_INCLUDE_DIRS}
  )
  set_target_properties(etcdlib_static PROPERTIES "SOVERSION" 1)
 -target_link_libraries(etcdlib_static ${CURL_LIBRARIES} ${JANSSON_LIBRARY})
 +target_link_libraries(etcdlib_static PRIVATE ${CURL_LIBRARIES} ${JANSSON_LIBRARY})
  
+ add_executable(etcdlib_test ${CMAKE_CURRENT_SOURCE_DIR}/test/etcdlib_test.c)
+ target_link_libraries(etcdlib_test etcdlib_static)
  
 +#TODO install etcdlib_static. For now left out, because the imported target leaks library
paths
  install(DIRECTORY api/ DESTINATION include/etcdlib COMPONENT ${ETCDLIB_CMP})
  if (NOT COMMAND celix_subproject) 
 -    install(TARGETS etcdlib etcdlib_static DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT
${ETCDLIB_CMP})
 +    install(TARGETS etcdlib DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${ETCDLIB_CMP})
  else ()
 -    install(TARGETS etcdlib etcdlib_static EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT ${ETCDLIB_CMP})
 +    install(TARGETS etcdlib EXPORT celix DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${ETCDLIB_CMP})
      #Setup target aliases to match external usage
      add_library(Celix::etcdlib ALIAS etcdlib)
      add_library(Celix::etcdlib_static ALIAS etcdlib_static)


Mime
View raw message