From 6139aa8b651ee716a0cec0ddaf951be09367b6a4 Mon Sep 17 00:00:00 2001 From: Baptiste DURAND Date: Fri, 31 Jan 2014 14:42:47 +0100 Subject: [PATCH] Fix build for x86_64 arch Use %cmake macro Change-Id: I2036c9ba89bc96ec2a9ef220fc5fdf504831d931 Signed-off-by: Baptiste DURAND --- CMakeLists.txt | 3 +-- packaging/tel-plugin-atmodem.spec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96c239b..5adee38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,6 @@ PROJECT(atmodem-plugin C) ### Global setting ### SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") # Set required packages @@ -49,7 +48,7 @@ SET_TARGET_PROPERTIES(atmodem-plugin PROPERTIES PREFIX "" OUTPUT_NAME atmodem-pl # install INSTALL(TARGETS atmodem-plugin - LIBRARY DESTINATION lib/telephony/plugins/modems) + LIBRARY DESTINATION ${LIB_INSTALL_DIR}/telephony/plugins/modems) INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/wiki_mcc_mnc_oper_list.sql DESTINATION /tmp RENAME mcc_mnc_oper_list.sql) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME tel-plugin-atmodem) diff --git a/packaging/tel-plugin-atmodem.spec b/packaging/tel-plugin-atmodem.spec index b94482f..ff87945 100644 --- a/packaging/tel-plugin-atmodem.spec +++ b/packaging/tel-plugin-atmodem.spec @@ -23,7 +23,7 @@ Telephony AT Modem library cp %{SOURCE1001} . %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake . make %{?jobs:-j%jobs} %post -- 2.7.4