From 4a6fe4c64be962b40d21dc41c02de1e8d79426c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Thu, 30 Jan 2014 15:38:36 +0100 Subject: [PATCH] Build wifi-direct-manager against Tizen Generic MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use LIB_INSTALL_DIR in CMakeLists.txt and %cmake in spec file. Bug-Tizen: PTREL-635 Change-Id: I67cba7622227edea7083815b851a6d2ce8d6a796 Signed-off-by: Kévin THIERRY --- packaging/wifi-direct-manager.spec | 2 +- plugin/wpasupplicant/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec index e979fed..4416e01 100644 --- a/packaging/wifi-direct-manager.spec +++ b/packaging/wifi-direct-manager.spec @@ -43,7 +43,7 @@ export ARCH=i586 %endif -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH +%cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH #make %{?jobs:-j%jobs} make %{?_smp_mflags} diff --git a/plugin/wpasupplicant/CMakeLists.txt b/plugin/wpasupplicant/CMakeLists.txt index 1e8e652..0d904ba 100755 --- a/plugin/wpasupplicant/CMakeLists.txt +++ b/plugin/wpasupplicant/CMakeLists.txt @@ -14,6 +14,8 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Wall") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") +SET(LIBDIR ${LIB_INSTALL_DIR}) + ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") ADD_DEFINITIONS("-DUSE_DLOG") @@ -32,7 +34,7 @@ IF("${ARCH}" MATCHES "^arm.*|.*86.*") SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "" OUTPUT_NAME ${PROJECT_NAME}) # install - INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib) + INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${LIBDIR}) ELSE() -- 2.7.4