meta-tizen/meta-tizen-common-base/recipes-application-framework/sensord/files/0002-Fix-libinstalldir.patch

   1 From ecdcc3fd5d7da81497b7fd33d74ca1e0fb9dc188 Mon Sep 17 00:00:00 2001
   2 From: Xavier Roche <xavrock.os@gmail.com>
   3 Date: Tue, 24 Feb 2015 15:48:42 +0100
   4 Subject: [PATCH] Fix lib install dir
   5
   6 Signed-off-by: Xavier Roche <xavrock.os@gmail.com>
   7 ---
   8  CMakeLists.txt                            | 4 ++--
   9  src/accel/CMakeLists.txt                  | 4 ++--
  10  src/auto_rotation/CMakeLists.txt          | 2 +-
  11  src/geo/CMakeLists.txt                    | 4 ++--
  12  src/gravity/CMakeLists.txt                | 2 +-
  13  src/gyro/CMakeLists.txt                   | 4 ++--
  14  src/libsensord/CMakeLists.txt             | 4 ++--
  15  src/light/CMakeLists.txt                  | 4 ++--
  16  src/linear_accel/CMakeLists.txt           | 2 +-
  17  src/orientation/CMakeLists.txt            | 2 +-
  18  src/pressure/CMakeLists.txt               | 4 ++--
  19  src/proxi/CMakeLists.txt                  | 4 ++--
  20  src/rotation_vector/rv/CMakeLists.txt     | 2 +-
  21  src/rotation_vector/rv_raw/CMakeLists.txt | 4 ++--
  22  src/sensor_fusion/CMakeLists.txt          | 2 +-
  23  src/shared/CMakeLists.txt                 | 8 ++++----
  24  src/temperature/CMakeLists.txt            | 4 ++--
  25  17 files changed, 30 insertions(+), 30 deletions(-)
  26
  27 diff --git a/CMakeLists.txt b/CMakeLists.txt
  28 index ad539ca..5cd0bea 100755
  29 --- a/CMakeLists.txt
  30 +++ b/CMakeLists.txt
  31 @@ -5,7 +5,7 @@ include(GNUInstallDirs)
  32  # Setup For pkgconfig File
  33  SET(PREFIX ${CMAKE_INSTALL_PREFIX})
  34  SET(EXEC_PREFIX "${PREFIX}/bin")
  35 -SET(LIBDIR "${PREFIX}/${CMAKE_INSTALL_LIBDIR}")
  36 +SET(LIBDIR "${PREFIX}/lib")
  37  SET(INCLUDEDIR "${PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
  38  SET(VERSION 1.0)
  39
  40 @@ -16,7 +16,7 @@ MESSAGE("FLAGS: ${CMAKE_CXX_FLAGS}")
  41  MESSAGE("FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
  42
  43  add_definitions(-DUSE_DLOG_LOG)
  44 -add_definitions(-DLIBDIR="${CMAKE_INSTALL_LIBDIR}")
  45 +add_definitions(-DLIBDIR="${LIBDIR}")
  46
  47  # Internal Debugging Options
  48  #add_definitions(-Wall -g -D_DEBUG)
  49 diff --git a/src/accel/CMakeLists.txt b/src/accel/CMakeLists.txt
  50 index a37c89c..2f98f37 100755
  51 --- a/src/accel/CMakeLists.txt
  52 +++ b/src/accel/CMakeLists.txt
  53 @@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
  54  target_link_libraries(${SENSOR_NAME} ${accel_pkgs_LDFLAGS} "-lm")
  55  target_link_libraries(${SENSOR_HAL_NAME} ${accel_pkgs_LDFLAGS})
  56
  57 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
  58 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
  59 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
  60 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
  61 diff --git a/src/auto_rotation/CMakeLists.txt b/src/auto_rotation/CMakeLists.txt
  62 index a0076b2..121c265 100644
  63 --- a/src/auto_rotation/CMakeLists.txt
  64 +++ b/src/auto_rotation/CMakeLists.txt
  65 @@ -25,4 +25,4 @@ add_library(${SENSOR_NAME} SHARED
  66
  67  target_link_libraries(${SENSOR_NAME} ${auto_rot_pkgs_LDFLAGS} "-lm")
  68
  69 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
  70 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
  71 diff --git a/src/geo/CMakeLists.txt b/src/geo/CMakeLists.txt
  72 index c6d4aa1..0c593c5 100755
  73 --- a/src/geo/CMakeLists.txt
  74 +++ b/src/geo/CMakeLists.txt
  75 @@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
  76  target_link_libraries(${SENSOR_NAME} ${geo_pkgs_LDFLAGS} "-lm")
  77  target_link_libraries(${SENSOR_HAL_NAME} ${geo_pkgs_LDFLAGS})
  78
  79 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
  80 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
  81 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
  82 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
  83 diff --git a/src/gravity/CMakeLists.txt b/src/gravity/CMakeLists.txt
  84 index e66964e..69ae097 100755
  85 --- a/src/gravity/CMakeLists.txt
  86 +++ b/src/gravity/CMakeLists.txt
  87 @@ -23,4 +23,4 @@ add_library(${SENSOR_NAME} SHARED
  88
  89  target_link_libraries(${SENSOR_NAME} ${gravity_pkgs_LDFLAGS} "-lm")
  90
  91 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
  92 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
  93 diff --git a/src/gyro/CMakeLists.txt b/src/gyro/CMakeLists.txt
  94 index 228fac9..f2ce149 100755
  95 --- a/src/gyro/CMakeLists.txt
  96 +++ b/src/gyro/CMakeLists.txt
  97 @@ -28,5 +28,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
  98  target_link_libraries(${SENSOR_NAME} ${gyro_pkgs_LDFLAGS} "-lm")
  99  target_link_libraries(${SENSOR_HAL_NAME} ${gyro_pkgs_LDFLAGS})
 100
 101 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 102 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 103 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 104 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
 105 diff --git a/src/libsensord/CMakeLists.txt b/src/libsensord/CMakeLists.txt
 106 index 5b57251..f507c93 100755
 107 --- a/src/libsensord/CMakeLists.txt
 108 +++ b/src/libsensord/CMakeLists.txt
 109 @@ -34,7 +34,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 110  SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 111
 112  configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
 113 -install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
 114 +install(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
 115  install(FILES sensor.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 116  install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 117  install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 118 @@ -59,4 +59,4 @@ install(FILES sensor_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 119  install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 120  install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 121  install(FILES sensor_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
 122 -install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 123 +install(FILES ${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
 124 diff --git a/src/light/CMakeLists.txt b/src/light/CMakeLists.txt
 125 index 099ff82..759cba7 100755
 126 --- a/src/light/CMakeLists.txt
 127 +++ b/src/light/CMakeLists.txt
 128 @@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
 129  target_link_libraries(${SENSOR_NAME} ${light_pkgs_LDFLAGS} "-lm")
 130  target_link_libraries(${SENSOR_HAL_NAME} ${light_pkgs_LDFLAGS})
 131
 132 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 133 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 134 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 135 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
 136 diff --git a/src/linear_accel/CMakeLists.txt b/src/linear_accel/CMakeLists.txt
 137 index 986fb11..52a573a 100755
 138 --- a/src/linear_accel/CMakeLists.txt
 139 +++ b/src/linear_accel/CMakeLists.txt
 140 @@ -24,4 +24,4 @@ add_library(${SENSOR_NAME} SHARED
 141
 142  target_link_libraries(${SENSOR_NAME} ${linear_accel_pkgs_LDFLAGS} "-lm")
 143
 144 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 145 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 146 diff --git a/src/orientation/CMakeLists.txt b/src/orientation/CMakeLists.txt
 147 index 6f02e9a..e7ef28a 100755
 148 --- a/src/orientation/CMakeLists.txt
 149 +++ b/src/orientation/CMakeLists.txt
 150 @@ -24,4 +24,4 @@ add_library(${SENSOR_NAME} SHARED
 151
 152  target_link_libraries(${SENSOR_NAME} ${orientation_pkgs_LDFLAGS} "-lm")
 153
 154 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 155 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 156 diff --git a/src/pressure/CMakeLists.txt b/src/pressure/CMakeLists.txt
 157 index e61aca4..9eb8df8 100755
 158 --- a/src/pressure/CMakeLists.txt
 159 +++ b/src/pressure/CMakeLists.txt
 160 @@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
 161  target_link_libraries(${SENSOR_NAME} ${pressure_pkgs_LDFLAGS} "-lm")
 162  target_link_libraries(${SENSOR_HAL_NAME} ${pressure_pkgs_LDFLAGS})
 163
 164 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 165 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 166 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 167 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
 168 diff --git a/src/proxi/CMakeLists.txt b/src/proxi/CMakeLists.txt
 169 index 7cd4517..e05cc43 100755
 170 --- a/src/proxi/CMakeLists.txt
 171 +++ b/src/proxi/CMakeLists.txt
 172 @@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
 173  target_link_libraries(${SENSOR_NAME} ${proxi_pkgs_LDFLAGS} "-lm")
 174  target_link_libraries(${SENSOR_HAL_NAME} ${proxi_pkgs_LDFLAGS})
 175
 176 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 177 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 178 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 179 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
 180 diff --git a/src/rotation_vector/rv/CMakeLists.txt b/src/rotation_vector/rv/CMakeLists.txt
 181 index d26d4f9..6e0e386 100755
 182 --- a/src/rotation_vector/rv/CMakeLists.txt
 183 +++ b/src/rotation_vector/rv/CMakeLists.txt
 184 @@ -24,4 +24,4 @@ add_library(${SENSOR_NAME} SHARED
 185
 186  target_link_libraries(${SENSOR_NAME} ${rv_pkgs_LDFLAGS} "-lm")
 187
 188 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 189 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 190 diff --git a/src/rotation_vector/rv_raw/CMakeLists.txt b/src/rotation_vector/rv_raw/CMakeLists.txt
 191 index 223b8c8..e83a639 100755
 192 --- a/src/rotation_vector/rv_raw/CMakeLists.txt
 193 +++ b/src/rotation_vector/rv_raw/CMakeLists.txt
 194 @@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
 195  target_link_libraries(${SENSOR_NAME} ${rv_raw_pkgs_LDFLAGS} "-lm")
 196  target_link_libraries(${SENSOR_HAL_NAME} ${rv_raw_pkgs_LDFLAGS})
 197
 198 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 199 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 200 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 201 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
 202 diff --git a/src/sensor_fusion/CMakeLists.txt b/src/sensor_fusion/CMakeLists.txt
 203 index c38f410..526b396 100755
 204 --- a/src/sensor_fusion/CMakeLists.txt
 205 +++ b/src/sensor_fusion/CMakeLists.txt
 206 @@ -35,4 +35,4 @@ add_library(${SENSOR_FUSION_NAME} SHARED
 207
 208  target_link_libraries(${SENSOR_FUSION_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
 209
 210 -install(TARGETS ${SENSOR_FUSION_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 211 +install(TARGETS ${SENSOR_FUSION_NAME} DESTINATION ${LIBDIR}/sensord)
 212 diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
 213 index f400944..3b37bb6 100755
 214 --- a/src/shared/CMakeLists.txt
 215 +++ b/src/shared/CMakeLists.txt
 216 @@ -51,10 +51,10 @@ target_link_libraries(sensord-share ${shared_pkgs_LDFLAGS} "-lrt -ldl -pthread")
 217  configure_file(sensord-server.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/sensord-server.pc @ONLY)
 218  configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
 219
 220 -install(TARGETS sensord-server DESTINATION ${CMAKE_INSTALL_LIBDIR})
 221 -install(TARGETS sensord-share DESTINATION ${CMAKE_INSTALL_LIBDIR})
 222 -install(FILES sensord-server.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 223 -install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 224 +install(TARGETS sensord-server DESTINATION ${LIBDIR})
 225 +install(TARGETS sensord-share DESTINATION ${LIBDIR})
 226 +install(FILES sensord-server.pc DESTINATION ${LIBDIR}/pkgconfig)
 227 +install(FILES ${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
 228  install(FILES
 229         crw_lock.h
 230         worker_thread.h
 231 diff --git a/src/temperature/CMakeLists.txt b/src/temperature/CMakeLists.txt
 232 index 87dab53..26e03c9 100755
 233 --- a/src/temperature/CMakeLists.txt
 234 +++ b/src/temperature/CMakeLists.txt
 235 @@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
 236  target_link_libraries(${SENSOR_NAME} ${temp_pkgs_LDFLAGS} "-lm")
 237  target_link_libraries(${SENSOR_HAL_NAME} ${temp_pkgs_LDFLAGS})
 238
 239 -install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 240 -install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
 241 +install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
 242 +install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
 243 --
 244 1.9.1
 245