diff options
author | Junfeng Dong <junfeng.dong@intel.com> | 2013-03-28 18:20:37 +0800 |
---|---|---|
committer | lifang <fangx.li@intel.com> | 2013-04-02 17:40:29 +0800 |
commit | 231c143ff59f6785db0f972f6f9e29512514b435 (patch) | |
tree | 8b4d7b816f7c57947dd83730c5bcc9f798620fb6 | |
parent | b6745a02625debab127ab90b9e3cf55f157cb8c0 (diff) | |
download | ui-gadget-1-231c143ff59f6785db0f972f6f9e29512514b435.tar.gz ui-gadget-1-231c143ff59f6785db0f972f6f9e29512514b435.tar.bz2 ui-gadget-1-231c143ff59f6785db0f972f6f9e29512514b435.zip |
Fix for 64 bit compatibility.
- Fix hardcoding path.
- Use %cmake to set default paths.
Change-Id: I84ab00b8e4e789b0abd80b897c9fbc6d5fdd2a04
-rwxr-xr-x | CMakeLists.txt | 14 | ||||
-rwxr-xr-x | packaging/ui-gadget-1.spec | 2 | ||||
-rwxr-xr-x | ug-efl-engine/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ui-gadget-1.pc.in | 4 |
4 files changed, 10 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 71b3437..67be412 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,6 @@ PROJECT(ui-gadget-1) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.1.0") @@ -41,12 +39,12 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${PKGS_LDFLAGS} -ldl) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) -INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ui-gadget-module.h DESTINATION include/ug-1) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ui-gadget-engine.h DESTINATION include/ug-1) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ui-gadget.h DESTINATION include/ug-1) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/SLP_UI_Gadget_PG.h DESTINATION include/ug-1) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ui-gadget-module.h DESTINATION ${INCLUDE_INSTALL_DIR}/ug-1) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ui-gadget-engine.h DESTINATION ${INCLUDE_INSTALL_DIR}/ug-1) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ui-gadget.h DESTINATION ${INCLUDE_INSTALL_DIR}/ug-1) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/SLP_UI_Gadget_PG.h DESTINATION ${INCLUDE_INSTALL_DIR}/ug-1) ADD_SUBDIRECTORY(ug-efl-engine) ADD_SUBDIRECTORY(client) diff --git a/packaging/ui-gadget-1.spec b/packaging/ui-gadget-1.spec index 9e96c3b..23bac8c 100755 --- a/packaging/ui-gadget-1.spec +++ b/packaging/ui-gadget-1.spec @@ -35,7 +35,7 @@ Development files for %{name} %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=/usr +%cmake . make %{?jobs:-j%jobs} diff --git a/ug-efl-engine/CMakeLists.txt b/ug-efl-engine/CMakeLists.txt index d0414f6..d498e2d 100755 --- a/ug-efl-engine/CMakeLists.txt +++ b/ug-efl-engine/CMakeLists.txt @@ -24,7 +24,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) SET_TARGET_PROPERTIES(${UG_EFL_ENGINE} PROPERTIES COMPILE_FLAGS "${UG_EFL_ENGINE_CFLAGS}") TARGET_LINK_LIBRARIES(${UG_EFL_ENGINE} ${PROJECT_NAME} ${UG_EFL_ENGINE_PKGS_LDFLAGS}) -INSTALL(TARGETS ${UG_EFL_ENGINE} DESTINATION /usr/lib) +INSTALL(TARGETS ${UG_EFL_ENGINE} DESTINATION ${LIB_INSTALL_DIR}) ADD_CUSTOM_TARGET(ug_effect.edj COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/ui-gadget-1.pc.in b/ui-gadget-1.pc.in index f011267..e6669a8 100644 --- a/ui-gadget-1.pc.in +++ b/ui-gadget-1.pc.in @@ -1,7 +1,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ -includedir=@INCLUDEDIR@/ug-1/ +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@/ug-1/ Name: UI Gadget Description: UI Gadget Library |