Merge two separated pkg config files into one

Change-Id: I16c9b99cdaf5e9f852e80b3af27bb177853ed352
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08f7334..6a8a8f0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,29 @@ INCLUDE_DIRECTORIES(
        ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 ADD_DEFINITIONS(-O2 -Wall -fPIC -fdata-sections -ffunction-sections -fvisibility=hidden)
+ADD_DEFINITIONS(-DLOG_TAG="CONTEXT")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIC -Wl,--as-needed -Wl,--gc-section -Wl,--print-gc-section")
 
+# Dependencies
+SET(DEPS "glib-2.0 gio-2.0 json-glib-1.0 sqlite3 capi-base-common dlog alarm-service")
+
+IF(${LEGACY_FILE_PATH})
+       ADD_DEFINITIONS(-DLEGACY_FILE_PATH)
+ELSE(${LEGACY_FILE_PATH})
+       SET(DEPS "${DEPS} libtzplatform-config")
+ENDIF(${LEGACY_FILE_PATH})
+
+IF(${LEGACY_PERIODIC_ALARM})
+       ADD_DEFINITIONS(-DLEGACY_PERIODIC_ALARM)
+ENDIF(${LEGACY_PERIODIC_ALARM})
+
+# Build flags
+pkg_check_modules(LIB_PKG REQUIRED ${DEPS})
+
+FOREACH(flag ${LIB_PKG_CFLAGS})
+   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+ENDFOREACH(flag)
+
 # Install
 INSTALL(
        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
@@ -16,5 +37,25 @@ INSTALL(
        FILES_MATCHING PATTERN "*.h"
 )
 
+SET(PC_NAME ${PROJECT_NAME})
+SET(VERSION ${FULLVER})
+SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/context-service/internal")
+SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+SET(PC_DESCRIPTION "Tizen Context-Service Shared Library")
+SET(PC_REQUIRED "${DEPS}")
+SET(PC_CFLAGS -I\${includedir}/context-service/internal)
+SET(PC_LDFLAGS "-lctx-shared -lctx-server")
+CONFIGURE_FILE(
+       ${PROJECT_NAME}.pc.in
+       ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+       @ONLY
+)
+
+INSTALL(
+       FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)
+
 ADD_SUBDIRECTORY(src/shared)
 ADD_SUBDIRECTORY(src/server)

diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 39df634..31c854b 100644 (file)
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -4,52 +4,10 @@ SET(target "ctx-server")
 FILE(GLOB_RECURSE SRCS *.cpp)
 MESSAGE("Sources: ${SRCS}")
 
-# Dependencies
-SET(DEPS "glib-2.0 gio-2.0 json-glib-1.0 sqlite3 capi-base-common dlog alarm-service")
-
-IF(${LEGACY_FILE_PATH})
-       ADD_DEFINITIONS(-DLEGACY_FILE_PATH)
-ELSE(${LEGACY_FILE_PATH})
-       SET(DEPS "${DEPS} libtzplatform-config")
-ENDIF(${LEGACY_FILE_PATH})
-
-IF(${LEGACY_PERIODIC_ALARM})
-       ADD_DEFINITIONS(-DLEGACY_PERIODIC_ALARM)
-ENDIF(${LEGACY_PERIODIC_ALARM})
-
-# Build flags
-pkg_check_modules(lib_pkg REQUIRED ${DEPS})
-
-FOREACH(flag ${lib_pkg_CFLAGS})
-   SET(LIB_EXTRA_CFLAGS "${LIB_EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
 ADD_LIBRARY(${target} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${target} ${lib_pkg_LDFLAGS})
+TARGET_LINK_LIBRARIES(${target} ${LIB_PKG_LDFLAGS})
 TARGET_LINK_LIBRARIES(${target} ctx-shared)
-SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_FLAGS ${LIB_EXTRA_CFLAGS})
-SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "LOG_TAG=\"CONTEXT\"")
 SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER})
 
 INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-SET(PC_NAME "libcontext-server")
-SET(VERSION ${FULLVER})
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/context-service/internal")
-SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-SET(PC_DESCRIPTION "Tizen Context-Service Shared Library")
-SET(PC_REQUIRED "${DEPS} libcontext-shared")
-SET(PC_CFLAGS -I\${includedir}/context-service/internal)
-SET(PC_LDFLAGS "-l${target}")
-CONFIGURE_FILE(
-       ../../${PROJECT_NAME}.pc.in
-       ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
-       @ONLY
-)
-
-INSTALL(
-       FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
-       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 34c9fb4..9e52d5b 100644 (file)
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -4,41 +4,9 @@ SET(target "ctx-shared")
 FILE(GLOB_RECURSE SRCS *.cpp)
 MESSAGE("Sources: ${SRCS}")
 
-# Dependencies
-SET(DEPS "glib-2.0 json-glib-1.0 capi-base-common dlog")
-
-# Build flags
-pkg_check_modules(lib_pkg REQUIRED ${DEPS})
-
-FOREACH(flag ${lib_pkg_CFLAGS})
-   SET(LIB_EXTRA_CFLAGS "${LIB_EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
 ADD_LIBRARY(${target} SHARED ${SRCS})
-TARGET_LINK_LIBRARIES(${target} ${lib_pkg_LDFLAGS})
-SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_FLAGS ${LIB_EXTRA_CFLAGS})
-SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITIONS "LOG_TAG=\"CONTEXT\"")
+TARGET_LINK_LIBRARIES(${target} ${LIB_PKG_LDFLAGS})
 SET_TARGET_PROPERTIES(${target} PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(${target} PROPERTIES VERSION ${FULLVER})
 
 INSTALL(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-SET(PC_NAME "libcontext-shared")
-SET(VERSION ${FULLVER})
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(PC_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/context-service/internal")
-SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-SET(PC_DESCRIPTION "Tizen Context-Service Shared Library")
-SET(PC_REQUIRED ${DEPS})
-SET(PC_CFLAGS -I\${includedir}/context-service/internal)
-SET(PC_LDFLAGS "-l${target}")
-CONFIGURE_FILE(
-       ../../${PROJECT_NAME}.pc.in
-       ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
-       @ONLY
-)
-
-INSTALL(
-       FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PC_NAME}.pc
-       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)