diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2019-04-30 22:18:08 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2019-04-30 22:18:08 +0200 |
| commit | d00bfe9410cfcaeb247ba68a88144defb5184ac9 (patch) | |
| tree | 58e4a07e9d7ebad3215122449dc43193078c5ded /bindings | |
| parent | 5214323d82cc09b15c25e348707f2639977ea763 (diff) | |
Allow to tune installation directories
The location of intrinsic bindings and samples could not be tuned
but was fixed to be ${CMAKE_INSTALL_FULL_LIBDIR}/afb and
${CMAKE_INSTALL_FULL_DATADIR}/af-binder
These default locations are not bad but it is important to be able
to tune that location.
Bug-AGL: SPEC-2367
Change-Id: I4d4f9e9490d61e3278ef35ac42f2143a752a7c37
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/intrinsics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | bindings/samples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | bindings/tutorials/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bindings/intrinsics/CMakeLists.txt b/bindings/intrinsics/CMakeLists.txt index ee981217..b7668ce8 100644 --- a/bindings/intrinsics/CMakeLists.txt +++ b/bindings/intrinsics/CMakeLists.txt @@ -29,5 +29,5 @@ SET_TARGET_PROPERTIES(afb-dbus-binding PROPERTIES ) TARGET_LINK_LIBRARIES(afb-dbus-binding ${json-c_LDFLAGS} ${libsystemd_LDFLAGS}) INSTALL(TARGETS afb-dbus-binding - LIBRARY DESTINATION ${binding_install_dir}) + LIBRARY DESTINATION ${INTRINSIC_BINDING_DIR}) diff --git a/bindings/samples/CMakeLists.txt b/bindings/samples/CMakeLists.txt index 51442684..c2dae240 100644 --- a/bindings/samples/CMakeLists.txt +++ b/bindings/samples/CMakeLists.txt @@ -21,7 +21,7 @@ macro(sample name source) set_target_properties(${name} PROPERTIES PREFIX "" LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map") # target_link_libraries(${name} ${link_libraries}) target_link_libraries(${name} ${json-c_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT}) - install(TARGETS ${name} LIBRARY DESTINATION ${install_datadir}/bindings/samples) + install(TARGETS ${name} LIBRARY DESTINATION ${SAMPLE_INSTALL_DIR}/bindings/samples) endmacro(sample) sample(authLogin AuthLogin.c) diff --git a/bindings/tutorials/CMakeLists.txt b/bindings/tutorials/CMakeLists.txt index e071d7a9..a3c87c55 100644 --- a/bindings/tutorials/CMakeLists.txt +++ b/bindings/tutorials/CMakeLists.txt @@ -24,7 +24,7 @@ MACRO(tuto num ext) LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export.map" ) TARGET_LINK_LIBRARIES(tuto-${num} ${json-c_LDFLAGS}) - install(TARGETS tuto-${num} LIBRARY DESTINATION ${install_datadir}/bindings/tutorials) + install(TARGETS tuto-${num} LIBRARY DESTINATION ${SAMPLE_INSTALL_DIR}/bindings/tutorials) ENDMACRO(tuto) |