From bf57cfee0e86ba6cd9110c8e0963511ab770ff19 Mon Sep 17 00:00:00 2001 From: Dongwook Lee Date: Wed, 29 Aug 2012 17:49:05 +0900 Subject: [PATCH] Fix emulator build error Change-Id: Icebdd88c783c50027221e50281123654883f8fdd --- CMakeLists.txt | 5 ++++- binary/CMakeLists.txt | 34 +++++++++++++--------------------- debian/changelog | 8 ++++++++ packaging/libwifi-direct.spec | 8 ++++---- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 930e0de..edb95e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,4 +8,7 @@ SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(binary) + +IF("${ARCH}" MATCHES "arm") + ADD_SUBDIRECTORY(binary) +ENDIF() diff --git a/binary/CMakeLists.txt b/binary/CMakeLists.txt index cdb932a..d3220ea 100644 --- a/binary/CMakeLists.txt +++ b/binary/CMakeLists.txt @@ -10,25 +10,17 @@ IF("${CMAKE_BUILD_TYPE}" STREQUAL "") ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") -EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") - -IF("${ARCH}" MATCHES "^arm.*") - - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd.p2p.conf DESTINATION etc/wifi-direct) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd.eth.conf DESTINATION etc/wifi-direct) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd.wl0.conf DESTINATION etc/wifi-direct) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd-notify.sh DESTINATION bin) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/udhcp_script.non-autoip DESTINATION etc/wifi-direct) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wifi-direct-server.sh DESTINATION bin) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wifi-direct-dhcp.sh DESTINATION bin) - - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wfd-manager DESTINATION bin) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wifi-direct-plugin-broadcom.so DESTINATION lib) - - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libbcmp2p.so DESTINATION lib) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libbcmp2papp.so DESTINATION lib) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libbcmp2psig.so DESTINATION lib) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libwpscli.so DESTINATION lib) - -ENDIF() +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd.p2p.conf DESTINATION etc/wifi-direct) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd.eth.conf DESTINATION etc/wifi-direct) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd.wl0.conf DESTINATION etc/wifi-direct) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dhcpd-notify.sh DESTINATION bin) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/udhcp_script.non-autoip DESTINATION etc/wifi-direct) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wifi-direct-server.sh DESTINATION bin) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wifi-direct-dhcp.sh DESTINATION bin) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wfd-manager DESTINATION bin) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wifi-direct-plugin-broadcom.so DESTINATION lib) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libbcmp2p.so DESTINATION lib) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libbcmp2papp.so DESTINATION lib) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libbcmp2psig.so DESTINATION lib) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libwpscli.so DESTINATION lib) diff --git a/debian/changelog b/debian/changelog index 4663c95..e7fe3a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libwifi-direct (0.2.11) unstable; urgency=low + + * Fix emulator build errro. + * Git : rsa/framework/connectivity/libwifi-direct + * Tag : libwifi-direct_0.2.11 + + -- Dongwook Lee Wed, 29 Aug 2012 17:48:39 +0900 + libwifi-direct (0.2.10) unstable; urgency=low * changed the binary of wifi-direct-manager. diff --git a/packaging/libwifi-direct.spec b/packaging/libwifi-direct.spec index 4e514f2..4910ab8 100755 --- a/packaging/libwifi-direct.spec +++ b/packaging/libwifi-direct.spec @@ -1,6 +1,6 @@ Name: libwifi-direct Summary: wifi direct library (Shared Library) -Version: 0.2.10 +Version: 0.2.11 Release: 1 Group: TO_BE_FILLED License: Apache-2.0 @@ -40,13 +40,13 @@ wifi direct library (Shared Library) (Developement) %setup -q %ifarch %{arm} -export ARCH=arm +%define ARCH arm %else -export ARCH=i586 +%define ARCH i586 %endif %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCH=%{ARCH} #make %{?jobs:-j%jobs} %install -- 2.7.4