Fix error when building without prebuilt lws library

Change-Id: If6b3d38c5902714344e4f4a52f3a4d7ed26e752c
Signed-off-by: cheoleun moon <chleun.moon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60f50dec5522f889c25d54f3b9a203d9e40e0aa9..bdb1403373f724c8b1a316c927d2164e0ad9c636 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,7 @@ SET(VINE_LOGGER_PATH ${PROJECT_SOURCE_DIR}/src/logger)
 
 IF(USE_LIBWEBSOCKETS_STATIC)
 IF(NOT USE_LIBWEBSOCKETS_STATIC_PREBUILT)
+       SET(TARGET_LWS "libwebsockets-v4.2-stable")
        SET(LWS_WITH_STATIC ON CACHE BOOL "" FORCE)
        SET(LWS_WITH_SHARED OFF CACHE BOOL "" FORCE)
        SET(LWS_WITH_EXTERNAL_POLL ON CACHE BOOL "" FORCE)
@@ -125,7 +126,11 @@ IF(NOT USE_LIBWEBSOCKETS_STATIC_PREBUILT)
        SET(LWS_WITH_SYS_SMD OFF CACHE BOOL "" FORCE)
        SET(LWS_WITH_NETLINK OFF CACHE BOOL "" FORCE)
        SET(LWS_WITH_VINE_EXT ON CACHE BOOL "" FORCE)
-       ADD_SUBDIRECTORY(third-party/libwebsockets)
+       EXECUTE_PROCESS(
+               WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/third-party"
+               COMMAND tar xzf "${PROJECT_SOURCE_DIR}/third-party/${TARGET_LWS}.tar.gz"
+       )
+       ADD_SUBDIRECTORY(third-party/${TARGET_LWS})
 ENDIF(NOT USE_LIBWEBSOCKETS_STATIC_PREBUILT)
        SET(PREBUILT_THIRD_PARTY_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/third-party/prebuilt/include")
 ENDIF(USE_LIBWEBSOCKETS_STATIC)

diff --git a/packaging/capi-network-vine.spec b/packaging/capi-network-vine.spec
index 64ee1240c9ce31cb3e35536cf30f386345f77e82..a4e2012a43d28e68d105b355024465685e7a46ee 100755 (executable)
--- a/packaging/capi-network-vine.spec
+++ b/packaging/capi-network-vine.spec
@@ -3,7 +3,7 @@
 %bcond_without use_glib_event_loop
 Name:    capi-network-vine
 Summary: An service discovery framework
-Version: 1.1.12
+Version: 1.1.13
 Release: 0
 Group:   Network & Connectivity/API
 License: Apache-2.0
@@ -129,24 +129,23 @@ find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
 rm -rf %{buildroot}
 %make_install
 
+%if %{with lws_static}
+rm -rf %{buildroot}%{_libdir}/cmake/libwebsockets
+%endif
+
 %if 0%{?gcov:1}
 mkdir -p %{buildroot}%{_datadir}/gcov/obj
 install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %endif
+
 %check
-%if 0%{?gcov:1}
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./tests/unittest/vine-unittest
-%endif
 
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -b . -d . -o %{name}.info
 genhtml %{name}.info -o out --legend --show-details
 %endif
 
-%if %{with lws_static}
-rm -rf %{buildroot}%{_libdir}/cmake/libwebsockets
-%endif
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig

diff --git a/third-party/libwebsockets-v4.2-stable.tar.gz b/third-party/libwebsockets-v4.2-stable.tar.gz
index 2a1b93b1eb7659af494271c7e3129376983ccb5b..66c146fe55cf93dc46cc798c107085ba83ceaa73 100644 (file)
Binary files a/third-party/libwebsockets-v4.2-stable.tar.gz and b/third-party/libwebsockets-v4.2-stable.tar.gz differ