From patchwork Thu Sep 17 11:54:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergiy Kibrik X-Patchwork-Id: 518814 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 564411401C7 for ; Thu, 17 Sep 2015 21:54:33 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C7E48284E27; Thu, 17 Sep 2015 13:53:15 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UPPERCASE_50_75 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id BE9DA286F89 for ; Thu, 17 Sep 2015 13:53:07 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .meta. - helo: .smtp.meta. - helo-domain: .meta.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from smtp.meta.ua (smtp.meta.ua [194.0.131.41]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Thu, 17 Sep 2015 13:53:07 +0200 (CEST) Received: from bargainingless-net.volia.net ([93.73.27.29]:43090 helo=localhost) by smtp.meta.ua with esmtpsa id 1ZcXlW-0003Pl-Kv by authid ; Thu, 17 Sep 2015 14:54:15 +0300 Received: by localhost (sSMTP sendmail emulation); Thu, 17 Sep 2015 14:54:25 +0300 From: Sergiy Kibrik To: openwrt-devel@lists.openwrt.org Date: Thu, 17 Sep 2015 14:54:07 +0300 Message-Id: <1442490847-11736-1-git-send-email-sakib@meta.ua> X-Mailer: git-send-email 1.9.1 X-MUA-GeoIP: UA X-Gen: cf6bd648c001e328b9a0ac9210195a45 Cc: Sergiy Kibrik Subject: [OpenWrt-Devel] [PATCH procd] cmake: use CMAKE_INSTALL_* variables X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Replace hard-coded installation directories with cmake-provided variables, which gives more flexibility on where to install final binaries. Great simplification for usage with e.g. BitBake recipes. Signed-off-by: Sergiy Kibrik --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6af17a3..78824e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ ENDIF() ADD_LIBRARY(setlbf SHARED service/setlbf.c) INSTALL(TARGETS setlbf - LIBRARY DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) @@ -39,7 +39,7 @@ ENDIF() ADD_EXECUTABLE(procd ${SOURCES}) TARGET_LINK_LIBRARIES(procd ${LIBS}) INSTALL(TARGETS procd - RUNTIME DESTINATION sbin + RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) @@ -47,19 +47,19 @@ ADD_EXECUTABLE(init initd/init.c initd/early.c initd/preinit.c initd/mkdev.c wat utils/utils.c ${SOURCES_ZRAM}) TARGET_LINK_LIBRARIES(init ${LIBS}) INSTALL(TARGETS init - RUNTIME DESTINATION sbin + RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) ADD_EXECUTABLE(udevtrigger plug/udevtrigger.c) INSTALL(TARGETS udevtrigger - RUNTIME DESTINATION sbin + RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) ADD_EXECUTABLE(askfirst utils/askfirst.c) INSTALL(TARGETS askfirst - RUNTIME DESTINATION sbin + RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) ADD_CUSTOM_COMMAND( @@ -73,7 +73,7 @@ IF(SECCOMP_SUPPORT) ADD_LIBRARY(preload-seccomp SHARED jail/preload.c jail/seccomp.c) TARGET_LINK_LIBRARIES(preload-seccomp dl ubox blobmsg_json) INSTALL(TARGETS preload-seccomp - LIBRARY DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) ADD_DEPENDENCIES(preload-seccomp headers) endif() @@ -82,19 +82,19 @@ IF(JAIL_SUPPORT) ADD_EXECUTABLE(ujail jail/jail.c jail/elf.c) TARGET_LINK_LIBRARIES(ujail ubox) INSTALL(TARGETS ujail - RUNTIME DESTINATION sbin + RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) ADD_EXECUTABLE(utrace trace/trace.c) TARGET_LINK_LIBRARIES(utrace ubox ${json} blobmsg_json) INSTALL(TARGETS utrace - RUNTIME DESTINATION sbin + RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) ADD_DEPENDENCIES(utrace headers) ADD_LIBRARY(preload-trace SHARED trace/preload.c) TARGET_LINK_LIBRARIES(preload-trace dl) INSTALL(TARGETS preload-trace - LIBRARY DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) endif()