diff mbox

[OpenWrt-Devel,procd] cmake: use CMAKE_INSTALL_* variables

Message ID 1442490847-11736-1-git-send-email-sakib@meta.ua
State Rejected
Headers show

Commit Message

Sergiy Kibrik Sept. 17, 2015, 11:54 a.m. UTC 
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 <sakib@meta.ua>
---
 CMakeLists.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Felix Fietkau Oct. 12, 2015, 1:50 p.m. UTC | #1 
On 2015-09-17 13:54, Sergiy Kibrik wrote:
> 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 <sakib@meta.ua>
Doesn't work for me:

CMake Error at CMakeLists.txt:15 (INSTALL):
  install TARGETS given no LIBRARY DESTINATION for shared library target
  "setlbf".


CMake Error at CMakeLists.txt:41 (INSTALL):
  install TARGETS given no RUNTIME DESTINATION for executable target
"procd".


CMake Error at CMakeLists.txt:49 (INSTALL):
  install TARGETS given no RUNTIME DESTINATION for executable target "init".


CMake Error at CMakeLists.txt:55 (INSTALL):
  install TARGETS given no RUNTIME DESTINATION for executable target
  "udevtrigger".


CMake Error at CMakeLists.txt:61 (INSTALL):
  install TARGETS given no RUNTIME DESTINATION for executable target
  "askfirst".


-- Configuring incomplete, errors occurred!
See also "/Users/nbd/procd/CMakeFiles/CMakeOutput.log".

- Felix
Sergiy Kibrik Oct. 13, 2015, 8:34 p.m. UTC | #2 
On 10/12/15 4:50 PM, Felix Fietkau wrote:
> On 2015-09-17 13:54, Sergiy Kibrik wrote:
>> 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 <sakib@meta.ua>
> Doesn't work for me:
> 

indeed, forgot to include GNUInstallDirs module. Will fix in v2.

--
regards,
Sergey
diff mbox

Patch

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()