From: Andy Green Date: Tue, 29 Mar 2016 13:49:47 +0000 (+0800) Subject: revert cmake remove targets from install path X-Git-Tag: submit/tizen/20160930.050355~43 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=674609e69a3ca8b87e09792e267bbfb01e3af147;p=platform%2Fupstream%2Flibwebsockets.git revert cmake remove targets from install path Signed-off-by: Andy Green --- diff --git a/CMakeLists.txt b/CMakeLists.txt index db85b5ae..304a2213 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1172,6 +1172,10 @@ install(FILES "${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake" DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev) +# Install exports for the install-tree. +install(EXPORT LibwebsocketsTargets + DESTINATION "${LWS_INSTALL_CMAKE_DIR}" COMPONENT dev) + # build subdir is not part of sources set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) ".git" "build" "tgz" "tar.gz") diff --git a/libwebsockets.spec b/libwebsockets.spec index ba73f3ba..4148aa62 100644 --- a/libwebsockets.spec +++ b/libwebsockets.spec @@ -1,6 +1,6 @@ Name: libwebsockets Version: 1.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Websocket Server and Client Library Group: System Environment/Libraries @@ -59,6 +59,7 @@ rm -rf $RPM_BUILD_ROOT /%{_libdir}/libwebsockets.so /%{_libdir}/cmake/libwebsockets/LibwebsocketsConfig.cmake /%{_libdir}/cmake/libwebsockets/LibwebsocketsConfigVersion.cmake +/%{_libdir}/cmake/libwebsockets/LibwebsocketsTargets.cmake /usr/share/libwebsockets-test-server %doc %files devel @@ -69,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT /%{_libdir}/pkgconfig/libwebsockets.pc %changelog +* Tue Mar 29 2016 Andy Green 1.7.4-2 +- MINOR added LibwebsocketsTargets.cmake + * Mon Mar 22 2016 Andy Green 1.7.4-1 - MINOR fixes Upstream 1.7.4 release (see changelog)