From: Youngjae Shin Date: Tue, 25 Aug 2020 06:46:15 +0000 (+0900) Subject: revise build scripts and packaging file X-Git-Tag: submit/tizen/20200826.004335^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Faccepted%2Ftizen_6.0_unified_hotfix;p=platform%2Fcore%2Fsystem%2Fmodes-plugins.git revise build scripts and packaging file Change-Id: I4707c50d9e7cd2bbda435f92aa038cf81c4a7f1d --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 66839c1..bf2fd1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,13 @@ ENDIF(STDOUT_LOG) IF(NOT DEFINED MODES_PLUGIN_DEFAULT_DIR) MESSAGE("No MODES_PLUGIN_DEFAULT_DIR. Check build system") - SET(MODES_PLUGIN_DEFAULT_DIR "/usr/lib/modes-plugins/") + SET(MODES_PLUGIN_DEFAULT_DIR "${LIB_INSTALL_DIR}/modes-plugins/") ENDIF(NOT DEFINED MODES_PLUGIN_DEFAULT_DIR) +PKG_CHECK_MODULES(pkgs REQUIRED modes dlog capi-base-common) +INCLUDE_DIRECTORIES(${pkgs_INCLUDE_DIRS}) +LINK_DIRECTORIES(${pkgs_LIBRARY_DIRS}) + SET(APP_PLUGIN "modes-plugin-app") ADD_SUBDIRECTORY(app) SET(BT_PLUGIN "modes-plugin-bluetooth") diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 75b80cd..cdbe33a 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,11 +1,12 @@ FILE(GLOB APP_SRCS *.cpp) -PKG_CHECK_MODULES(app_pkgs REQUIRED modes dlog capi-base-common aul - capi-appfw-application capi-appfw-app-manager) +PKG_CHECK_MODULES(app_pkgs REQUIRED aul capi-appfw-application capi-appfw-app-manager) INCLUDE_DIRECTORIES(${app_pkgs_INCLUDE_DIRS}) LINK_DIRECTORIES(${app_pkgs_LIBRARY_DIRS}) ADD_LIBRARY(${APP_PLUGIN} SHARED ${APP_SRCS}) -TARGET_LINK_LIBRARIES(${APP_PLUGIN} ${app_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${APP_PLUGIN} ${pkgs_LIBRARIES} ${app_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${APP_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${app_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${APP_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_app_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR}) diff --git a/bluetooth/CMakeLists.txt b/bluetooth/CMakeLists.txt index 7a5413a..039c7f8 100644 --- a/bluetooth/CMakeLists.txt +++ b/bluetooth/CMakeLists.txt @@ -1,11 +1,12 @@ FILE(GLOB BT_SRCS *.cpp) -pkg_check_modules(bluetooth_pkgs REQUIRED modes dlog capi-base-common - capi-network-bluetooth) -INCLUDE_DIRECTORIES(${bluetooth_pkgs_INCLUDE_DIRS}) -LINK_DIRECTORIES(${bluetooth_pkgs_LIBRARY_DIRS}) +pkg_check_modules(BT_pkgs REQUIRED capi-network-bluetooth) +INCLUDE_DIRECTORIES(${BT_pkgs_INCLUDE_DIRS}) +LINK_DIRECTORIES(${BT_pkgs_LIBRARY_DIRS}) ADD_LIBRARY(${BT_PLUGIN} SHARED ${BT_SRCS}) -TARGET_LINK_LIBRARIES(${BT_PLUGIN} ${bluetooth_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${BT_PLUGIN} ${pkgs_LIBRARIES} ${BT_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${BT_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${BT_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${BT_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_bt_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR}) diff --git a/display/CMakeLists.txt b/display/CMakeLists.txt index df0dd66..82fcab0 100644 --- a/display/CMakeLists.txt +++ b/display/CMakeLists.txt @@ -1,13 +1,16 @@ FILE(GLOB DISPLAY_SRCS *.cpp) -PKG_CHECK_MODULES(DISPLAY_pkgs REQUIRED modes dlog capi-base-common - capi-system-device ecore ecore-wl2 capi-ui-efl-util vconf) +PKG_CHECK_MODULES(DISPLAY_pkgs REQUIRED capi-system-device ecore ecore-wl2 + capi-ui-efl-util vconf) INCLUDE_DIRECTORIES(${DISPLAY_pkgs_INCLUDE_DIRS}) LINK_DIRECTORIES(${DISPLAY_pkgs_LIBRARY_DIRS}) ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT") ADD_LIBRARY(${DISPLAY_PLUGIN} SHARED ${DISPLAY_SRCS}) -TARGET_LINK_LIBRARIES(${DISPLAY_PLUGIN} ${DISPLAY_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${DISPLAY_PLUGIN} + ${pkgs_LIBRARIES} ${DISPLAY_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${DISPLAY_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${DISPLAY_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${DISPLAY_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_display_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR}) diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt index f2f983d..6b6b0d8 100644 --- a/media/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -1,11 +1,12 @@ FILE(GLOB PKG_SRCS *.cpp) -PKG_CHECK_MODULES(MEDIA_pkgs REQUIRED modes dlog capi-base-common - capi-media-sound-manager capi-media-player) +PKG_CHECK_MODULES(MEDIA_pkgs REQUIRED capi-media-sound-manager capi-media-player) INCLUDE_DIRECTORIES(${MEDIA_pkgs_INCLUDE_DIRS}) LINK_DIRECTORIES(${MEDIA_pkgs_LIBRARY_DIRS}) ADD_LIBRARY(${MEDIA_PLUGIN} SHARED ${PKG_SRCS}) -TARGET_LINK_LIBRARIES(${MEDIA_PLUGIN} ${MEDIA_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${MEDIA_PLUGIN} ${pkgs_LIBRARIES} ${MEDIA_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${MEDIA_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${MEDIA_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${MEDIA_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_media_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR}) diff --git a/packaging/modes-plugins.spec b/packaging/modes-plugins.spec index c9de9a8..b237c01 100644 --- a/packaging/modes-plugins.spec +++ b/packaging/modes-plugins.spec @@ -11,25 +11,25 @@ Source1001: %{name}.manifest BuildRequires: cmake BuildRequires: modes-plugin-devel -BuildRequires: pkgconfig(modes) -BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-appfw-app-manager) -BuildRequires: pkgconfig(capi-media-sound-manager) -BuildRequires: pkgconfig(capi-media-player) -BuildRequires: pkgconfig(capi-system-device) BuildRequires: pkgconfig(capi-base-common) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(capi-network-wifi-manager) +BuildRequires: pkgconfig(capi-media-player) +BuildRequires: pkgconfig(capi-media-sound-manager) BuildRequires: pkgconfig(capi-network-bluetooth) -BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(capi-network-wifi-manager) +BuildRequires: pkgconfig(capi-system-device) +BuildRequires: pkgconfig(capi-ui-efl-util) +BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(ecore) +BuildRequires: pkgconfig(ecore-wl2) BuildRequires: pkgconfig(gmock) -BuildRequires: pkgconfig(aul) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(modes) BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(pkgmgr-info) -BuildRequires: pkgconfig(ecore) -BuildRequires: pkgconfig(ecore-wl2) -BuildRequires: pkgconfig(capi-ui-efl-util) +BuildRequires: pkgconfig(vconf) %if 0%{?gcov:1} BuildRequires: lcov %endif @@ -62,9 +62,9 @@ Group: System/Testing The %{name}-gcov package contains gcov objects %endif -%define modes_plugin_dir %{_libdir}/%{name} -%define modes_plugin_test_dir %{_bindir}/%{name} -%define modes_ro_dir %{_datadir}/modes +%global modes_plugin_dir %{_libdir}/%{name} +%global modes_plugin_test_dir %{_bindir}/%{name} +%global modes_ro_dir %{_datadir}/modes %prep %setup -q @@ -94,7 +94,7 @@ make %{?_smp_mflags} %make_install %if 0%{?gcov:1} find .. -name '*.gcno' | tar cf %{name}-gcov.tar -T - -install -d -m 755 %{buildroot}%{_datadir}/gcov/obj +install -d -m 0755 %{buildroot}%{_datadir}/gcov/obj tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj %endif diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt index 7a27104..e122c1e 100644 --- a/pkg/CMakeLists.txt +++ b/pkg/CMakeLists.txt @@ -1,11 +1,13 @@ FILE(GLOB PKG_SRCS *.cpp) -PKG_CHECK_MODULES(PKG_pkgs REQUIRED modes dlog capi-base-common - capi-appfw-application capi-appfw-app-manager aul pkgmgr pkgmgr-info) +PKG_CHECK_MODULES(PKG_pkgs REQUIRED capi-appfw-application capi-appfw-app-manager + aul pkgmgr pkgmgr-info) INCLUDE_DIRECTORIES(${PKG_pkgs_INCLUDE_DIRS}) LINK_DIRECTORIES(${PKG_pkgs_LIBRARY_DIRS}) ADD_LIBRARY(${PKG_PLUGIN} SHARED ${PKG_SRCS}) -TARGET_LINK_LIBRARIES(${PKG_PLUGIN} ${PKG_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${PKG_PLUGIN} ${pkgs_LIBRARIES} ${PKG_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${PKG_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${PKG_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${PKG_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_pkg_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR}) diff --git a/std/CMakeLists.txt b/std/CMakeLists.txt index 3d5637d..6667724 100644 --- a/std/CMakeLists.txt +++ b/std/CMakeLists.txt @@ -1,10 +1,12 @@ FILE(GLOB STD_SRCS *.cpp) -PKG_CHECK_MODULES(std_pkgs REQUIRED modes dlog glib-2.0) -INCLUDE_DIRECTORIES(${std_pkgs_INCLUDE_DIRS}) -LINK_DIRECTORIES(${std_pkgs_LIBRARY_DIRS}) +PKG_CHECK_MODULES(STD_pkgs REQUIRED glib-2.0) +INCLUDE_DIRECTORIES(${STD_pkgs_INCLUDE_DIRS}) +LINK_DIRECTORIES(${STD_pkgs_LIBRARY_DIRS}) ADD_LIBRARY(${STD_PLUGIN} SHARED ${STD_SRCS}) -TARGET_LINK_LIBRARIES(${STD_PLUGIN} ${std_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${STD_PLUGIN} ${pkgs_LIBRARIES} ${STD_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${STD_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${STD_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${STD_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_std_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1c1bf07..b6ab674 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,7 +5,7 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) SET(CMAKE_INSTALL_RPATH "${MODES_PLUGIN_DEFAULT_DIR}") ADD_DEFINITIONS("-DMDS_TEST") -PKG_CHECK_MODULES(test_pkgs REQUIRED modes dlog gmock glib-2.0 aul vconf +PKG_CHECK_MODULES(test_pkgs REQUIRED gmock glib-2.0 aul vconf capi-appfw-app-manager) INCLUDE_DIRECTORIES(${test_pkgs_INCLUDE_DIRS}) LINK_DIRECTORIES(${test_pkgs_LIBRARY_DIRS}) @@ -13,52 +13,79 @@ LINK_DIRECTORIES(${test_pkgs_LIBRARY_DIRS}) SET(INTEGRATION_TEST "modes-plugintest-mode") ADD_EXECUTABLE(${INTEGRATION_TEST} mdsp_test_integration.cpp) -TARGET_LINK_LIBRARIES(${INTEGRATION_TEST} ${test_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${INTEGRATION_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${INTEGRATION_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${INTEGRATION_TEST} DESTINATION ${TEST_INSTALL_DIR}) FILE(GLOB MODE_EX mode/*.xml) INSTALL(FILES ${MODE_EX} DESTINATION ${MODES_MODE_DEFAULT_DIR}) + #===================================================================# LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/app) SET(APP_PLUGIN_TEST "modes-plugintest-app") ADD_EXECUTABLE(${APP_PLUGIN_TEST} mdsp_test_app.cpp) -TARGET_LINK_LIBRARIES(${APP_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${APP_PLUGIN}) +TARGET_LINK_LIBRARIES(${APP_PLUGIN_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES} ${APP_PLUGIN}) +TARGET_COMPILE_OPTIONS(${APP_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${APP_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) + #===================================================================# LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/bluetooth) SET(BT_PLUGIN_TEST "modes-plugintest-bt") ADD_EXECUTABLE(${BT_PLUGIN_TEST} mdsp_test_bt.cpp) -TARGET_LINK_LIBRARIES(${BT_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${BT_PLUGIN}) +TARGET_LINK_LIBRARIES(${BT_PLUGIN_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES} ${BT_PLUGIN}) +TARGET_COMPILE_OPTIONS(${BT_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${BT_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) + #===================================================================# LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/display) SET(DISPLAY_PLUGIN_TEST "modes-plugintest-display") ADD_EXECUTABLE(${DISPLAY_PLUGIN_TEST} mdsp_test_display.cpp) -TARGET_LINK_LIBRARIES(${DISPLAY_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${DISPLAY_PLUGIN}) +TARGET_LINK_LIBRARIES(${DISPLAY_PLUGIN_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES} ${DISPLAY_PLUGIN}) +TARGET_COMPILE_OPTIONS(${DISPLAY_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${DISPLAY_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) + #===================================================================# LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/media) SET(MEDIA_PLUGIN_TEST "modes-plugintest-media") ADD_EXECUTABLE(${MEDIA_PLUGIN_TEST} mdsp_test_media.cpp) TARGET_LINK_LIBRARIES(${MEDIA_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${MEDIA_PLUGIN}) +TARGET_COMPILE_OPTIONS(${MEDIA_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${MEDIA_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) + #===================================================================# LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/pkg) SET(PKG_PLUGIN_TEST "modes-plugintest-pkg") ADD_EXECUTABLE(${PKG_PLUGIN_TEST} mdsp_test_pkg.cpp) -TARGET_LINK_LIBRARIES(${PKG_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${PKG_PLUGIN}) +TARGET_LINK_LIBRARIES(${PKG_PLUGIN_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES} ${PKG_PLUGIN}) +TARGET_COMPILE_OPTIONS(${PKG_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${PKG_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) + #===================================================================# LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/std) SET(STD_PLUGIN_TEST "modes-plugintest-std") ADD_EXECUTABLE(${STD_PLUGIN_TEST} mdsp_test_std.cpp) -TARGET_LINK_LIBRARIES(${STD_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${STD_PLUGIN}) +TARGET_LINK_LIBRARIES(${STD_PLUGIN_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES} ${STD_PLUGIN}) +TARGET_COMPILE_OPTIONS(${STD_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${STD_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) + #===================================================================# SET(VCONF_SRC_DIR "${CMAKE_SOURCE_DIR}/vconf" ) SET(VCONF_PLUGIN_TEST "modes-plugintest-vconf") @@ -67,12 +94,19 @@ FILE(GLOB VCONF_SRCS ${VCONF_SRC_DIR}/*.cpp) SET(VCONF_SRCS ${VCONF_SRCS} "mdsp_test_vconf.cpp") ADD_EXECUTABLE(${VCONF_PLUGIN_TEST} ${VCONF_SRCS}) -TARGET_LINK_LIBRARIES(${VCONF_PLUGIN_TEST} ${test_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${VCONF_PLUGIN_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${VCONF_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${VCONF_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) + #===================================================================# LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/wifi) SET(WIFI_PLUGIN_TEST "modes-plugintest-wifi") ADD_EXECUTABLE(${WIFI_PLUGIN_TEST} mdsp_test_wifi.cpp) -TARGET_LINK_LIBRARIES(${WIFI_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${WIFI_PLUGIN}) +TARGET_LINK_LIBRARIES(${WIFI_PLUGIN_TEST} + ${pkgs_LIBRARIES} ${test_pkgs_LIBRARIES} ${WIFI_PLUGIN}) +TARGET_COMPILE_OPTIONS(${WIFI_PLUGIN_TEST} PUBLIC + ${pkgs_CFLAGS_OTHER} ${test_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${WIFI_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR}) diff --git a/vconf/CMakeLists.txt b/vconf/CMakeLists.txt index e030ac4..86dd017 100644 --- a/vconf/CMakeLists.txt +++ b/vconf/CMakeLists.txt @@ -1,10 +1,12 @@ FILE(GLOB VCONF_SRCS *.cpp) -PKG_CHECK_MODULES(vconf_pkgs REQUIRED modes dlog capi-base-common vconf) -INCLUDE_DIRECTORIES(${vconf_pkgs_INCLUDE_DIRS}) -LINK_DIRECTORIES(${vconf_pkgs_LIBRARY_DIRS}) +PKG_CHECK_MODULES(VCONF_pkgs REQUIRED vconf) +INCLUDE_DIRECTORIES(${VCONF_pkgs_INCLUDE_DIRS}) +LINK_DIRECTORIES(${VCONF_pkgs_LIBRARY_DIRS}) ADD_LIBRARY(${VCONF_PLUGIN} SHARED ${VCONF_SRCS}) -TARGET_LINK_LIBRARIES(${VCONF_PLUGIN} ${vconf_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${VCONF_PLUGIN} ${pkgs_LIBRARIES} ${VCONF_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${VCONF_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${VCONF_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${VCONF_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_vconf_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR}) diff --git a/wifi/CMakeLists.txt b/wifi/CMakeLists.txt index 48acae6..33232cc 100644 --- a/wifi/CMakeLists.txt +++ b/wifi/CMakeLists.txt @@ -1,10 +1,12 @@ FILE(GLOB WIFI_SRCS *.cpp) -pkg_check_modules(wifi_pkgs REQUIRED modes dlog capi-base-common capi-network-wifi-manager) -INCLUDE_DIRECTORIES(${wifi_pkgs_INCLUDE_DIRS}) -LINK_DIRECTORIES(${wifi_pkgs_LIBRARY_DIRS}) +pkg_check_modules(WIFI_pkgs REQUIRED capi-network-wifi-manager) +INCLUDE_DIRECTORIES(${WIFI_pkgs_INCLUDE_DIRS}) +LINK_DIRECTORIES(${WIFI_pkgs_LIBRARY_DIRS}) ADD_LIBRARY(${WIFI_PLUGIN} SHARED ${WIFI_SRCS}) -TARGET_LINK_LIBRARIES(${WIFI_PLUGIN} ${wifi_pkgs_LIBRARIES}) +TARGET_LINK_LIBRARIES(${WIFI_PLUGIN} ${pkgs_LIBRARIES} ${WIFI_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${WIFI_PLUGIN} PUBLIC + ${pkgs_CFLAGS_OTHER} ${WIFI_pkgs_CFLAGS_OTHER}) INSTALL(TARGETS ${WIFI_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR}) INSTALL(FILES tizen_wifi_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR})