~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/platforms/android/client/CMakeLists.txt

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
set_target_properties(
25
25
  mirclientplatformandroid PROPERTIES
26
26
  OUTPUT_NAME android
27
 
  LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}/client-modules
 
27
  LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/client-modules
28
28
  PREFIX ""
 
29
  SUFFIX ".so.${MIR_CLIENT_PLATFORM_ABI}"
29
30
  LINK_FLAGS "-Wl,--version-script,${symbol_map}"
30
31
)
31
32
 
32
33
target_link_libraries(mirclientplatformandroid
33
34
  mirclient
34
 
  mirsharedandroid
 
35
  mirsharedandroid-static
35
36
  ${LIBHARDWARE_LIBRARIES}
36
37
)
37
38