Fix build under 64-bit architecture

- Ignore cast warnings
- Install to "lib64"
- Use default macro

Change-Id: If6b246ceb411fc703fd688a9cb10255d2cecdac1
Signed-off-by: loul <loic.plassart@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e81c842..a3c077e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(deviced C)
+INCLUDE(GNUInstallDirs)
 
 ########################################################
 # Build options:
@@ -15,7 +16,7 @@ ENDIF()
 ########################################################
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}/bin")
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR "${PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 SET(INCLUDEDIR "${PREFIX}/include/${PROJECT_NAME}")
 SET(DATADIR "${PREFIX}/share/${PROJECT_NAME}")
 SET(CONFDIR "/etc/${PROJECT_NAME}")
@@ -137,7 +138,7 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Werror")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -fno-omit-frame-pointer -finstrument-functions")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -lrt")
 MESSAGE("FLAGS: ${CMAKE_C_FLAGS}")
@@ -145,6 +146,7 @@ MESSAGE("FLAGS: ${CMAKE_C_FLAGS}")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
 ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"")
+ADD_DEFINITIONS("-DPROP_DISPLAY_MAX_BRIGHTNESS=1")
 ADD_DEFINITIONS("-DENABLE_KEY_FILTER")
 IF(X11_SUPPORT)
 ADD_DEFINITIONS("-DENABLE_X_LCD_ONOFF")
@@ -169,7 +171,7 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/deviced/ DESTINATION include/$
                PATTERN "*.h")
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/deviced-pre.sh DESTINATION bin)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/deviced.conf DESTINATION /etc/dbus-1/system.d)

diff --git a/src/libdeviced/CMakeLists.txt b/src/libdeviced/CMakeLists.txt
index d333f38..84bd333 100755 (executable)
--- a/src/libdeviced/CMakeLists.txt
+++ b/src/libdeviced/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(libdeviced C)
+INCLUDE(GNUInstallDirs)
 
 SET(LIBDEVICED_SRCS
        battery.c
@@ -38,4 +39,4 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 # The logical name of executable and library targes
 # does not have to correspond to the physical file name built.
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME deviced)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)

diff --git a/src/libdevman/CMakeLists.txt b/src/libdevman/CMakeLists.txt
index 8755802..5d7f279 100644 (file)
--- a/src/libdevman/CMakeLists.txt
+++ b/src/libdevman/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(devman C)
+INCLUDE(GNUInstallDirs)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(rpkgs REQUIRED
@@ -30,7 +31,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/${INC_DIR})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "${PREFIX}/bin")
 SET(INCLUDEDIR "${PREFIX}/include/${PROJECT_NAME}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
 SET(DATADIR "${PREFIX}/share/devman")
 SET(VERSION 0.1)
 
@@ -50,9 +51,9 @@ INSTALL(TARGETS display_wd DESTINATION bin)
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 CONFIGURE_FILE(${PROJECT_NAME}_haptic.pc.in ${PROJECT_NAME}_haptic.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_haptic.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_haptic.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME})

diff --git a/src/libhaptic/CMakeLists.txt b/src/libhaptic/CMakeLists.txt
index ff32331..a3deebd 100644 (file)
--- a/src/libhaptic/CMakeLists.txt
+++ b/src/libhaptic/CMakeLists.txt
@@ -1,10 +1,11 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(haptic C)
+INCLUDE(GNUInstallDirs)
 
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
 SET(VERSION 0.1)
 
 SET(SRCS
@@ -44,9 +45,9 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION})
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 CONFIGURE_FILE(${PROJECT_NAME}-plugin.pc.in ${PROJECT_NAME}-plugin.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-plugin.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-plugin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME})

diff --git a/src/libslp-pm/CMakeLists.txt b/src/libslp-pm/CMakeLists.txt
index 87bdf40..1182344 100644 (file)
--- a/src/libslp-pm/CMakeLists.txt
+++ b/src/libslp-pm/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(pmapi C)
+INCLUDE(GNUInstallDirs)
 
 SET(SRCS pm.c)
 SET(HEADERS pmapi.h pmapi_managed.h SLP_pm_PG.h)
@@ -7,7 +8,7 @@ SET(HEADERS pmapi.h pmapi_managed.h SLP_pm_PG.h)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
 SET(VERSION 1.2)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -29,8 +30,8 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 FOREACH(hfile ${HEADERS})
        INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME})

diff --git a/src/libsysman/CMakeLists.txt b/src/libsysman/CMakeLists.txt
index 23b3fd8..646c07d 100755 (executable)
--- a/src/libsysman/CMakeLists.txt
+++ b/src/libsysman/CMakeLists.txt
@@ -1,5 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(sysman C)
+INCLUDE(GNUInstallDirs)
 
 SET(SRCS
        sysnoti.c
@@ -9,7 +10,7 @@ SET(SRCS
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
-SET(LIBDIR "\${prefix}/lib")
+SET(LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
 SET(VERSION_MAJOR 0)
 SET(VERSION "${VERSION_MAJOR}.2.0")
  
@@ -37,9 +38,9 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/sysman.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/sysman_managed.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/sysman-internal.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/SLP_sysman_PG.h DESTINATION include/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)