diff options
author | jy910.yun <jy910.yun@samsung.com> | 2013-06-21 14:17:10 +0900 |
---|---|---|
committer | jy910.yun <jy910.yun@samsung.com> | 2013-06-21 14:59:27 +0900 |
commit | bea9e9dd29ca3128e4746a5c481d8b30ec844dff (patch) | |
tree | 2e549e693198701f0bc127ae315e27753c2ef74d | |
parent | 3068e2f750b8251205eaa0fe202c4863a34effa1 (diff) | |
download | deviced-bea9e9dd29ca3128e4746a5c481d8b30ec844dff.tar.gz deviced-bea9e9dd29ca3128e4746a5c481d8b30ec844dff.tar.bz2 deviced-bea9e9dd29ca3128e4746a5c481d8b30ec844dff.zip |
Fix x86-64 build
-> Use %cmake macro
-> Fix libraries path in pc file
-> Fix installation for libraries
Signed-off-by: jy910.yun <jy910.yun@samsung.com>
Change-Id: I3917df7fe3509e6a51e674f4e55d7d22e6c96e2f
-rwxr-xr-x | CMakeLists.txt | 11 | ||||
-rw-r--r-- | deviced.pc.in | 4 | ||||
-rw-r--r-- | libslp-pm/CMakeLists.txt | 6 | ||||
-rw-r--r-- | libslp-pm/pmapi.pc.in | 2 | ||||
-rwxr-xr-x | packaging/system-server.spec | 3 | ||||
-rwxr-xr-x | sysman/CMakeLists.txt | 7 | ||||
-rw-r--r-- | sysman/sysman.pc.in | 2 |
7 files changed, 13 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a42f5a73..42ca22c3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,14 +77,11 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -# libdeviced 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}") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -MESSAGE("FLAGS: ${CMAKE_C_FLAGS}") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") @@ -109,14 +106,14 @@ CONFIGURE_FILE(device-daemon.in device-daemon @ONLY) ADD_LIBRARY(${DEVICED_NAME} SHARED ${DEVICED_SRCS}) TARGET_LINK_LIBRARIES(${DEVICED_NAME} ${pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${DEVICED_NAME} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${DEVICED_NAME} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${DEVICED_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) FOREACH(hfile ${DEVICED_HEADERS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${DEVICED_NAME}) ENDFOREACH(hfile) CONFIGURE_FILE(${DEVICED_NAME}.pc.in ${DEVICED_NAME}.pc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEVICED_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEVICED_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-ldl" "-ludev" "-lsmack") @@ -129,8 +126,8 @@ INSTALL(FILES system-server.conf DESTINATION /etc/dbus-1/system.d) INSTALL(FILES ${CMAKE_SOURCE_DIR}/packaging/system-server.rule DESTINATION /opt/etc/smack/accesses.d) INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/mmc-smack-label DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION /usr/lib/systemd/system) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket DESTINATION /usr/lib/systemd/system) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.service DESTINATION ${LIB_INSTALL_DIR}/systemd/system) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/systemd/system-server.socket DESTINATION ${LIB_INSTALL_DIR}/systemd/system) ADD_SUBDIRECTORY(restarter) ADD_SUBDIRECTORY(sys_event) diff --git a/deviced.pc.in b/deviced.pc.in index 3de6ff0f..fb732e64 100644 --- a/deviced.pc.in +++ b/deviced.pc.in @@ -2,8 +2,8 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=/usr/lib -includedir=/usr/include/deviced +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDEDIR@/deviced Name: deviced library Description: Tizen platform device control library diff --git a/libslp-pm/CMakeLists.txt b/libslp-pm/CMakeLists.txt index 33ee4b89..53dfd4ea 100644 --- a/libslp-pm/CMakeLists.txt +++ b/libslp-pm/CMakeLists.txt @@ -6,7 +6,6 @@ SET(HEADERS pmapi.h pmapi_managed.h SLP_pm_PG.h) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION 1.2) @@ -17,7 +16,6 @@ FOREACH(flag ${pkg_CFLAGS}) ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") @@ -30,8 +28,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 ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) FOREACH(hfile ${HEADERS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${hfile} DESTINATION include/${PROJECT_NAME}) diff --git a/libslp-pm/pmapi.pc.in b/libslp-pm/pmapi.pc.in index f32c72ff..c030919c 100644 --- a/libslp-pm/pmapi.pc.in +++ b/libslp-pm/pmapi.pc.in @@ -2,7 +2,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: libpmapi diff --git a/packaging/system-server.spec b/packaging/system-server.spec index 14b011e3..5e2db6be 100755 --- a/packaging/system-server.spec +++ b/packaging/system-server.spec @@ -110,14 +110,13 @@ Deviced library for device control (devel) %prep %setup -q -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} %build cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . cp %{SOURCE4} . -make %{?jobs:-j%jobs} +%cmake . %install rm -rf %{buildroot} diff --git a/sysman/CMakeLists.txt b/sysman/CMakeLists.txt index e830d906..1b497682 100755 --- a/sysman/CMakeLists.txt +++ b/sysman/CMakeLists.txt @@ -8,7 +8,6 @@ SET(SRCS SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.2.0") @@ -23,9 +22,7 @@ FOREACH(flag ${pkgs_CFLAGS}) ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -fno-omit-frame-pointer -fvisibility=hidden") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -MESSAGE("FLAGS: ${CMAKE_C_FLAGS}") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"") @@ -39,11 +36,11 @@ 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 ${LIB_INSTALL_DIR} 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 ${LIB_INSTALL_DIR}/pkgconfig) ADD_SUBDIRECTORY(set_pmon) diff --git a/sysman/sysman.pc.in b/sysman/sysman.pc.in index a461b64c..66412e41 100644 --- a/sysman/sysman.pc.in +++ b/sysman/sysman.pc.in @@ -2,7 +2,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: libsysman |