revise build scripts

for reducing build time

Change-Id: I57124ab75c69d456e1d08024de47ee580604e083

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b494da55036c6cce16136b6e33c90de46a1a1d95..7a1e34dd24e85e617b2869ab95db9da48a5ae56b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,11 +15,19 @@ IF(NOT DEFINED MODES_PLUGIN_DEFAULT_DIR)
        SET(MODES_PLUGIN_DEFAULT_DIR "/usr/lib/modes-plugins/")
 ENDIF(NOT DEFINED MODES_PLUGIN_DEFAULT_DIR)
 
-ADD_SUBDIRECTORY(wifi)
-ADD_SUBDIRECTORY(vconf)
+SET(APP_PLUGIN "modes-plugin-app")
 ADD_SUBDIRECTORY(app)
-ADD_SUBDIRECTORY(pkg)
+SET(BT_PLUGIN "modes-plugin-bluetooth")
 ADD_SUBDIRECTORY(bluetooth)
-ADD_SUBDIRECTORY(media)
+SET(DISPLAY_PLUGIN "modes-plugin-display")
 ADD_SUBDIRECTORY(display)
+SET(MEDIA_PLUGIN "modes-plugin-media")
+ADD_SUBDIRECTORY(media)
+SET(PKG_PLUGIN "modes-plugin-pkg")
+ADD_SUBDIRECTORY(pkg)
+SET(VCONF_PLUGIN "modes-plugin-vconf")
+ADD_SUBDIRECTORY(vconf)
+SET(WIFI_PLUGIN "modes-plugin-wifi")
+ADD_SUBDIRECTORY(wifi)
+
 ADD_SUBDIRECTORY(tests)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index d2632daeeb6cba18081746ed0d0c5d66bf71353a..75b80cdd8a24ba789fceec4aa27d09ff3a383c88 100644 (file)
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,13 +1,11 @@
-SET(APP_PLUGIN "modes-plugin-app")
-
 FILE(GLOB APP_SRCS *.cpp)
 
-PKG_CHECK_MODULES(app_pkgs REQUIRED modes dlog capi-base-common capi-appfw-application capi-appfw-app-manager aul)
+PKG_CHECK_MODULES(app_pkgs REQUIRED modes dlog capi-base-common 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})
-SET_TARGET_PROPERTIES(${APP_PLUGIN} PROPERTIES NO_SONAME 1 )
 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 77b6b216c6f73b4ece1b7b9925daccbb0bb0a362..7a5413a0b862a014c42ef9f331e012ce8bd9084d 100644 (file)
--- a/bluetooth/CMakeLists.txt
+++ b/bluetooth/CMakeLists.txt
@@ -1,13 +1,11 @@
-SET(BT_PLUGIN "modes-plugin-bluetooth")
-
 FILE(GLOB BT_SRCS *.cpp)
 
-pkg_check_modules(bluetooth_pkgs REQUIRED modes dlog capi-base-common capi-network-bluetooth)
+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})
 
 ADD_LIBRARY(${BT_PLUGIN} SHARED ${BT_SRCS})
 TARGET_LINK_LIBRARIES(${BT_PLUGIN} ${bluetooth_pkgs_LIBRARIES})
-SET_TARGET_PROPERTIES(${BT_PLUGIN} PROPERTIES NO_SONAME 1 )
 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 85bf7cc385ac8a3173f7a6bc2ee1ebb224ceea33..df0dd669bf30ff989d3df3472651d5f8bb2e044e 100644 (file)
--- a/display/CMakeLists.txt
+++ b/display/CMakeLists.txt
@@ -1,14 +1,13 @@
-SET(DISPLAY_PLUGIN "modes-plugin-display")
-ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT")
-
 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 modes dlog capi-base-common
+       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})
-SET_TARGET_PROPERTIES(${DISPLAY_PLUGIN} PROPERTIES NO_SONAME 1 )
 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 c66fad984507785c51d8195ed19e56779017108b..f2f983dc9123fca7c50920d4d8e1fa83820b2f5c 100644 (file)
--- a/media/CMakeLists.txt
+++ b/media/CMakeLists.txt
@@ -1,13 +1,11 @@
-SET(MEDIA_PLUGIN "modes-plugin-media")
-
 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 modes dlog capi-base-common
+       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})
-SET_TARGET_PROPERTIES(${MEDIA_PLUGIN} PROPERTIES NO_SONAME 1 )
 INSTALL(TARGETS ${MEDIA_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR})
 INSTALL(FILES tizen_media_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR})

diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt
index c4c363a9fc83c16dfb72571ea08f8bff0d87b0f7..7a271045f603b3e2f6d71a2fce82ddbb45c72cab 100644 (file)
--- a/pkg/CMakeLists.txt
+++ b/pkg/CMakeLists.txt
@@ -1,13 +1,11 @@
-SET(PKG_PLUGIN "modes-plugin-pkg")
-
 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 modes dlog capi-base-common
+       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})
-SET_TARGET_PROPERTIES(${PKG_PLUGIN} PROPERTIES NO_SONAME 1 )
 INSTALL(TARGETS ${PKG_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR})
 INSTALL(FILES tizen_pkg_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR})

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 65d9a7f206d9362663734aefd5cd2b4594edefe7..aedb09ae40ee34ad4e1208b3174d1e1cc7d6f4c5 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,83 +1,68 @@
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
+SET(CMAKE_SKIP_RPATH FALSE)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+SET(CMAKE_INSTALL_RPATH "${MODES_PLUGIN_DEFAULT_DIR}")
 ADD_DEFINITIONS("-DMDS_TEST")
-ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT")
 
-PKG_CHECK_MODULES(test_pkgs REQUIRED modes dlog gmock capi-network-wifi-manager capi-network-bluetooth vconf
-       capi-appfw-application capi-appfw-app-manager aul
-       capi-media-sound-manager capi-media-player
-       pkgmgr pkgmgr-info capi-system-device
-       evas elementary ecore ecore-wl2 capi-ui-efl-util)
+PKG_CHECK_MODULES(test_pkgs REQUIRED modes dlog gmock glib-2.0 aul vconf
+       capi-appfw-app-manager)
 INCLUDE_DIRECTORIES(${test_pkgs_INCLUDE_DIRS})
 LINK_DIRECTORIES(${test_pkgs_LIBRARY_DIRS})
 
 SET(INTEGRATION_TEST "modes-plugintest-mode")
-SET(INTEGRATION_SRCS "mdsp_test_integration.cpp")
-ADD_EXECUTABLE(${INTEGRATION_TEST} ${INTEGRATION_SRCS})
+
+ADD_EXECUTABLE(${INTEGRATION_TEST} mdsp_test_integration.cpp)
 TARGET_LINK_LIBRARIES(${INTEGRATION_TEST} ${test_pkgs_LIBRARIES})
 INSTALL(TARGETS ${INTEGRATION_TEST} DESTINATION ${TEST_INSTALL_DIR})
 FILE(GLOB MODE_EX mode/*.xml)
 INSTALL(FILES ${MODE_EX} DESTINATION ${MODES_MODE_DEFAULT_DIR})
 #===================================================================#
-SET(WIFI_SRC_DIR "${CMAKE_SOURCE_DIR}/wifi" )
-SET(WIFI_PLUGIN_TEST "modes-plugintest-wifi")
-FILE(GLOB WIFI_SRCS ${WIFI_SRC_DIR}/*.cpp)
-SET(WIFI_SRCS ${WIFI_SRCS} "mdsp_test_wifi.cpp")
+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/app)
+SET(APP_PLUGIN_TEST "modes-plugintest-app")
 
-ADD_EXECUTABLE(${WIFI_PLUGIN_TEST} ${WIFI_SRCS})
-TARGET_LINK_LIBRARIES(${WIFI_PLUGIN_TEST} ${test_pkgs_LIBRARIES})
-INSTALL(TARGETS ${WIFI_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
+ADD_EXECUTABLE(${APP_PLUGIN_TEST} mdsp_test_app.cpp)
+TARGET_LINK_LIBRARIES(${APP_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${APP_PLUGIN})
+INSTALL(TARGETS ${APP_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
 #===================================================================#
-SET(BT_SRC_DIR "${CMAKE_SOURCE_DIR}/bluetooth" )
+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/bluetooth)
 SET(BT_PLUGIN_TEST "modes-plugintest-bt")
-FILE(GLOB BT_SRCS ${BT_SRC_DIR}/*.cpp)
-SET(BT_SRCS ${BT_SRCS} "mdsp_test_bt.cpp")
 
-ADD_EXECUTABLE(${BT_PLUGIN_TEST} ${BT_SRCS})
-TARGET_LINK_LIBRARIES(${BT_PLUGIN_TEST} ${test_pkgs_LIBRARIES})
+ADD_EXECUTABLE(${BT_PLUGIN_TEST} mdsp_test_bt.cpp)
+TARGET_LINK_LIBRARIES(${BT_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${BT_PLUGIN})
 INSTALL(TARGETS ${BT_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
 #===================================================================#
-SET(APP_SRC_DIR "${CMAKE_SOURCE_DIR}/app" )
-SET(APP_PLUGIN_TEST "modes-plugintest-app")
-FILE(GLOB APP_SRCS ${APP_SRC_DIR}/*.cpp)
-SET(APP_SRCS ${APP_SRCS} "mdsp_test_app.cpp")
+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/display)
+SET(DISPLAY_PLUGIN_TEST "modes-plugintest-display")
 
-ADD_EXECUTABLE(${APP_PLUGIN_TEST} ${APP_SRCS})
-TARGET_LINK_LIBRARIES(${APP_PLUGIN_TEST} ${test_pkgs_LIBRARIES})
-INSTALL(TARGETS ${APP_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
+ADD_EXECUTABLE(${DISPLAY_PLUGIN_TEST} mdsp_test_display.cpp)
+TARGET_LINK_LIBRARIES(${DISPLAY_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${DISPLAY_PLUGIN})
+INSTALL(TARGETS ${DISPLAY_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
 #===================================================================#
-SET(PKG_SRC_DIR "${CMAKE_SOURCE_DIR}/pkg" )
+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})
+INSTALL(TARGETS ${MEDIA_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
+#===================================================================#
+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/pkg)
 SET(PKG_PLUGIN_TEST "modes-plugintest-pkg")
-FILE(GLOB PKG_SRCS ${PKG_SRC_DIR}/*.cpp)
-SET(PKG_SRCS ${PKG_SRCS} "mdsp_test_pkg.cpp")
 
-ADD_EXECUTABLE(${PKG_PLUGIN_TEST} ${PKG_SRCS})
-TARGET_LINK_LIBRARIES(${PKG_PLUGIN_TEST} ${test_pkgs_LIBRARIES})
+ADD_EXECUTABLE(${PKG_PLUGIN_TEST} mdsp_test_pkg.cpp)
+TARGET_LINK_LIBRARIES(${PKG_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${PKG_PLUGIN})
 INSTALL(TARGETS ${PKG_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
 #===================================================================#
-SET(VCONF_SRC_DIR "${CMAKE_SOURCE_DIR}/vconf" )
+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/vconf)
 SET(VCONF_PLUGIN_TEST "modes-plugintest-vconf")
-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})
+ADD_EXECUTABLE(${VCONF_PLUGIN_TEST} mdsp_test_vconf.cpp)
+TARGET_LINK_LIBRARIES(${VCONF_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${VCONF_PLUGIN})
 INSTALL(TARGETS ${VCONF_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
 #===================================================================#
-SET(MEDIA_SRC_DIR "${CMAKE_SOURCE_DIR}/media" )
-SET(MEDIA_PLUGIN_TEST "modes-plugintest-media")
-FILE(GLOB MEDIA_SRCS ${MEDIA_SRC_DIR}/*.cpp)
-SET(MEDIA_SRCS ${MEDIA_SRCS} "mdsp_test_media.cpp")
-
-ADD_EXECUTABLE(${MEDIA_PLUGIN_TEST} ${MEDIA_SRCS})
-TARGET_LINK_LIBRARIES(${MEDIA_PLUGIN_TEST} ${test_pkgs_LIBRARIES})
-INSTALL(TARGETS ${MEDIA_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
-#===================================================================#
-SET(DISPLAY_SRC_DIR "${CMAKE_SOURCE_DIR}/display" )
-SET(DISPLAY_PLUGIN_TEST "modes-plugintest-display")
-FILE(GLOB DISPLAY_SRCS ${DISPLAY_SRC_DIR}/*.cpp)
-SET(DISPLAY_SRCS ${DISPLAY_SRCS} "mdsp_test_display.cpp")
+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/wifi)
+SET(WIFI_PLUGIN_TEST "modes-plugintest-wifi")
 
-ADD_EXECUTABLE(${DISPLAY_PLUGIN_TEST} ${DISPLAY_SRCS})
-TARGET_LINK_LIBRARIES(${DISPLAY_PLUGIN_TEST} ${test_pkgs_LIBRARIES})
-INSTALL(TARGETS ${DISPLAY_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})
+ADD_EXECUTABLE(${WIFI_PLUGIN_TEST} mdsp_test_wifi.cpp)
+TARGET_LINK_LIBRARIES(${WIFI_PLUGIN_TEST} ${test_pkgs_LIBRARIES} ${WIFI_PLUGIN})
+INSTALL(TARGETS ${WIFI_PLUGIN_TEST} DESTINATION ${TEST_INSTALL_DIR})

diff --git a/vconf/CMakeLists.txt b/vconf/CMakeLists.txt
index 9304a1726f783c4218f53aa0d56997e5e0e55500..e030ac40ae84ab1b72f0236b7829b6d854b31dec 100644 (file)
--- a/vconf/CMakeLists.txt
+++ b/vconf/CMakeLists.txt
@@ -1,5 +1,3 @@
-SET(VCONF_PLUGIN "modes-plugin-vconf")
-
 FILE(GLOB VCONF_SRCS *.cpp)
 
 PKG_CHECK_MODULES(vconf_pkgs REQUIRED modes dlog capi-base-common vconf)
@@ -8,6 +6,5 @@ LINK_DIRECTORIES(${vconf_pkgs_LIBRARY_DIRS})
 
 ADD_LIBRARY(${VCONF_PLUGIN} SHARED ${VCONF_SRCS})
 TARGET_LINK_LIBRARIES(${VCONF_PLUGIN} ${vconf_pkgs_LIBRARIES})
-SET_TARGET_PROPERTIES(${VCONF_PLUGIN} PROPERTIES NO_SONAME 1 )
 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 8c946031a0e530d2930c2ab37bf7717a2f6a97a4..48acae62d97903b24c7d53f2df4ea4c6658dabda 100644 (file)
--- a/wifi/CMakeLists.txt
+++ b/wifi/CMakeLists.txt
@@ -1,5 +1,3 @@
-SET(WIFI_PLUGIN "modes-plugin-wifi")
-
 FILE(GLOB WIFI_SRCS *.cpp)
 
 pkg_check_modules(wifi_pkgs REQUIRED modes dlog capi-base-common capi-network-wifi-manager)
@@ -8,6 +6,5 @@ LINK_DIRECTORIES(${wifi_pkgs_LIBRARY_DIRS})
 
 ADD_LIBRARY(${WIFI_PLUGIN} SHARED ${WIFI_SRCS})
 TARGET_LINK_LIBRARIES(${WIFI_PLUGIN} ${wifi_pkgs_LIBRARIES})
-SET_TARGET_PROPERTIES(${WIFI_PLUGIN} PROPERTIES NO_SONAME 1 )
 INSTALL(TARGETS ${WIFI_PLUGIN} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR})
 INSTALL(FILES tizen_wifi_rule.xml DESTINATION ${MODES_ACTIONRULE_DEFAULT_DIR})