diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-03-25 19:43:12 +0800 |
|---|---|---|
| committer | lifang <fangx.li@intel.com> | 2013-03-29 05:20:58 +0800 |
| commit | df14a3d94e2ec1681d1656dc4263791b24b3870a (patch) | |
| tree | ef34aecb70cc30fd5381f98c0f8c8223a17f0d32 /CMakeLists.txt | |
| parent | fe586d36916373dd4cd5b3e90207cc5f26c64091 (diff) | |
| download | libslp-sensor-df14a3d94e2ec1681d1656dc4263791b24b3870a.tar.gz libslp-sensor-df14a3d94e2ec1681d1656dc4263791b24b3870a.tar.bz2 libslp-sensor-df14a3d94e2ec1681d1656dc4263791b24b3870a.zip | |
Fix for 64 bit compatibility.
- Use %cmake macro to set default path
- Fix hard-coded library path
- Fix the wrong cast between int and pointer.
Change-Id: I4c0636e5e2e30f07f72aea9063de06d588bef901
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f7b1b63..37baba3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ project(sensor CXX) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") SET(VERSION_MAJOR 1) SET(VERSION "${VERSION_MAJOR}.1.0") @@ -45,7 +44,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY) #install(DIRECTORY include/ DESTINATION include/ FILES_MATCHING PATTERN "*.h") -install(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries) +install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) install(FILES include/sensor.h DESTINATION include/sensor/) install(FILES include/sensor_accel.h DESTINATION include/sensor/) @@ -57,4 +56,4 @@ install(FILES include/sensor_gyro.h DESTINATION include/sensor/) install(FILES include/sensor_barometer.h DESTINATION include/sensor/) install(FILES include/sensor_fusion.h DESTINATION include/sensor/) -install(FILES ${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +install(FILES ${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) |