prepare dependency for osp-appfw refactoring
authorYoung Ik Cho <youngik.cho@samsung.com>
Thu, 18 Jul 2013 08:55:06 +0000 (17:55 +0900)
committerYoung Ik Cho <youngik.cho@samsung.com>
Thu, 18 Jul 2013 09:23:34 +0000 (18:23 +0900)
Change-Id: I7097b43f27ddf75f843ed93f21950ad77f3a607e
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>
plugins/accessory-condition-handler/CMakeLists.txt
plugins/alarm-condition-handler/CMakeLists.txt
plugins/calendar-condition-handler/CMakeLists.txt [changed mode: 0755->0644]
plugins/message-condition-handler/CMakeLists.txt [changed mode: 0755->0644]
plugins/nfc-condition-handler/CMakeLists.txt [changed mode: 0755->0644]

index 8dcfb15..8497981 100644 (file)
@@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES (
        /usr/include/osp/app
        /usr/include/osp/base
        /usr/include/osp/io
+       /usr/include/osp/server
        ../../inc
        ./
        )
@@ -29,5 +30,5 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
 
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
 TARGET_LINK_LIBRARIES(${this_target} "-lail")
index a99dc6e..805e688 100644 (file)
@@ -6,6 +6,7 @@ INCLUDE_DIRECTORIES (
        /usr/include/osp/base
        /usr/include/osp/io
        /usr/include/osp/system
+       /usr/include/osp/server
        /usr/include/appfw
        ../../inc
        )
@@ -30,7 +31,7 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 ADD_DEPENDENCIES(${this_target} osp-appfw)
 
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
 TARGET_LINK_LIBRARIES(${this_target} "-lalarm")
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-application")
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-appfw-app-manager")
old mode 100755 (executable)
new mode 100644 (file)
index 3f0bb8d..6bbdaf0
@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES (
        /usr/include/osp
        /usr/include/osp/app
        /usr/include/osp/base
+       /usr/include/osp/server
        /usr/lib/glib-2.0/include
        /usr/include/calendar-service2
        )
@@ -28,5 +29,5 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 ADD_DEPENDENCIES(${this_target} osp-appfw)
 
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -Wl,--no-undefined -Wl,--as-needed)
-TARGET_LINK_LIBRARIES(${this_target} "-lcalendar-service2" )
\ No newline at end of file
+TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} "-lcalendar-service2" )
old mode 100755 (executable)
new mode 100644 (file)
index e65d2f4..7189fc7
@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES (
        /usr/include/osp
        /usr/include/osp/app
        /usr/include/osp/base
+       /usr/include/osp/server
        /usr/lib/glib-2.0/include
        /usr/include/messaging
        )
@@ -28,5 +29,5 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 ADD_DEPENDENCIES(${this_target} osp-appfw)
 
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -Wl,--no-undefined -Wl,--as-needed)
-TARGET_LINK_LIBRARIES(${this_target} "-lcapi-messaging-messages" )
\ No newline at end of file
+TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} "-lcapi-messaging-messages" )
old mode 100755 (executable)
new mode 100644 (file)
index d88b5dc..06024ce
@@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES (
        /usr/include/osp
        /usr/include/osp/app
        /usr/include/osp/base
+       /usr/include/osp/server
        ../../inc
        )
 
@@ -28,5 +29,5 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES})
 ADD_DEPENDENCIES(${this_target} osp-appfw)
 
 SET_TARGET_PROPERTIES(${this_target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_INSTALL_DIR}/lib")
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -lail -Wl,--no-undefined -Wl,--as-needed)
+TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp -losp-appfw -L/usr/lib/osp-server -losp-appfw-server -lail -Wl,--no-undefined -Wl,--as-needed)