diff options
| author | Sangyoon Jang <s89.jang@samsung.com> | 2015-06-03 19:18:29 +0900 |
|---|---|---|
| committer | Sangyoon Jang <s89.jang@samsung.com> | 2015-06-03 19:41:34 +0900 |
| commit | 2347c96a9796a84c3e6c5515fb8dadc6545ba26e (patch) | |
| tree | 251d09213103cb34adaee655183e9c0d1d16fb10 /src | |
| parent | 86ff1445e36c35c83a6a6cb0d80afe70ed7fa8ac (diff) | |
| download | alarm-manager-2347c96a9796a84c3e6c5515fb8dadc6545ba26e.tar.gz alarm-manager-2347c96a9796a84c3e6c5515fb8dadc6545ba26e.tar.bz2 alarm-manager-2347c96a9796a84c3e6c5515fb8dadc6545ba26e.zip | |
Fix build break on aarch64, clean up CMakeLists.txtsubmit/tizen/20150604.015042
use macro instead of hardcoded path
set so version using package version
remove unused cmake variables
add visibility attribute on libalarm apis
Change-Id: Ic0b334d689909033bb700866f4a63e414bb413ff
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/alarm-lib.c | 4 |
2 files changed, 9 insertions, 19 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 079195d..06f905d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,12 +1,4 @@ SET(this_target alarm) -ADD_DEFINITIONS("-DPREFIX=\"${PREFIX}\"") - -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") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) @@ -16,7 +8,7 @@ INCLUDE(FindPkgConfig) pkg_check_modules(lib_pkgs REQUIRED ${LIB_PKGS}) FOREACH(flag ${lib_pkgs_CFLAGS}) - SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag} -Wall -Wno-unused") + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) SET(${this_target}_SOURCE_FILES @@ -32,7 +24,7 @@ ADD_CUSTOM_COMMAND( ../alarm_mgr.xml COMMENT "Generating Server GDBus .c/.h") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Wno-unused -fvisibility=hidden") ADD_LIBRARY(${this_target} SHARED ${${this_target}_SOURCE_FILES} alarm-mgr-stub.c) @@ -42,22 +34,16 @@ SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${EXEC SET_TARGET_PROPERTIES(${this_target} PROPERTIES - VERSION 0.0.0 + VERSION ${FULLVER} SOVERSION ${MAJORVER} CLEAN_DIRECT_OUTPUT 1 ) TARGET_LINK_LIBRARIES(${this_target} ${lib_pkgs_LDFLAGS}) -ADD_CUSTOM_COMMAND(TARGET ${this_target} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER}${LIBRARY_OUTPUT_PATH} ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER} - -) - # pkgconfig file CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/alarm-service.pc.in ${CMAKE_SOURCE_DIR}/alarm-service.pc @ONLY) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/alarm-service.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/alarm-service.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/ FILES_MATCHING PATTERN "alarm.h") -INSTALL(TARGETS ${this_target} DESTINATION lib) +INSTALL(TARGETS ${this_target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/alarm-lib.c b/src/alarm-lib.c index 7ffd65b..c282bec 100644 --- a/src/alarm-lib.c +++ b/src/alarm-lib.c @@ -41,6 +41,10 @@ #define MAX_KEY_SIZE 256 #define MAX_PROC_NAME_LEN 512 +#ifndef EXPORT_API +#define EXPORT_API __attribute__ ((visibility("default"))) +#endif + static alarm_context_t alarm_context = { NULL, NULL, NULL, NULL, -1 }; static bool b_initialized = false; |