diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-12 17:38:12 +0800 |
|---|---|---|
| committer | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-12 19:10:06 +0800 |
| commit | 0941642651661c5a3c838b3f2c81faeafcb6f957 (patch) | |
| tree | a5081191d53ca5a73cf4467559684106bb393ce4 | |
| parent | 355f613c82b44a361f48af444c12bf771d2d5be4 (diff) | |
| download | com-core-submit/tizen_2.1/20130424.230822.tar.gz com-core-submit/tizen_2.1/20130424.230822.tar.bz2 com-core-submit/tizen_2.1/20130424.230822.zip | |
Fix for 64 bit compatibility.submit/tizen_2.1/20130424.230822accepted/tizen_2.1/20130425.0354502.1b_release
- Fix hardcoding path.
- Use %cmake to set default paths.
Change-Id: I484687e5906fe33fdb435cc14f1a83cd751c67f1
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | packaging/libcom-core.spec | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d17b78e..4449a0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(com-core C) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") SET(PROJECT_NAME "${PROJECT_NAME}") -SET(LIBDIR "\${exec_prefix}/lib") +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.0.1") @@ -23,7 +23,7 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -g -Wall -Werror -Winline") +SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -g -Wall -Winline") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") @@ -47,8 +47,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc") -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/secure_socket.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/com-core.h DESTINATION include/${PROJECT_NAME}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/com-core_packet.h DESTINATION include/${PROJECT_NAME}) diff --git a/packaging/libcom-core.spec b/packaging/libcom-core.spec index b76205a..83123de 100644 --- a/packaging/libcom-core.spec +++ b/packaging/libcom-core.spec @@ -24,7 +24,7 @@ Light-weight IPC supporting library (dev) %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%cmake make %{?jobs:-j%jobs} %install |