Merge lp:~vanvugt/mir/fix-1401365 into lp:mir

[Daniel van Vugt]

Rename mir_demo_server back to mir_demo_server_basic.

It's still confusing given we also have mir_demo_server_{minimal,shell}
but this makes things more consistent at least, and fixes a CI build
failure (LP: #1401365)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2146
http://jenkins.qa.ubuntu.com/job/mir-ci/2351/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/459
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/459
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/433/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/348/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/433
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/433/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3645/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16517

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2351/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Fixes the failure - we can argue about names at leisure

review: Approve

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2014-12-11 02:43:01 +0000
+++ examples/CMakeLists.txt	2014-12-11 04:09:07 +0000
@@ -158,12 +158,12 @@
 
 install(TARGETS ${INSTALL_DEMOS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-add_executable(mir_demo_server
+add_executable(mir_demo_server_basic
   server_example.cpp
   glog_logger.cpp
 )
 
-target_link_libraries(mir_demo_server
+target_link_libraries(mir_demo_server_basic
   mirserver
   exampleserverconfig
   ${GLog_LIBRARY}
@@ -171,7 +171,7 @@
   ${Boost_LIBRARIES}
 )
 
-install(TARGETS mir_demo_server
+install(TARGETS mir_demo_server_basic
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )