Merge pull request #14 from rdumusc/master

Fix CPack config. Update default hostname for Geneva setup.

CMake/CPackConfig.cmake

@@ -5,22 +5,17 @@
 # General CPack configuration
 # Info: http://www.itk.org/Wiki/CMake:Component_Install_With_CPack
 
-set(CPACK_PACKAGE_EXECUTABLES "${STREAMER_APP_NAME}")
-set(CPACK_PACKAGE_NAME "${STREAMER_APP_NAME}")
+set(CPACK_PACKAGE_EXECUTABLES "${DESKTOPSTREAMER_APP_NAME}")
+set(CPACK_PACKAGE_NAME "${DESKTOPSTREAMER_APP_NAME}")
 set(CPACK_PACKAGE_CONTACT "Daniel Nachbaur <[email protected]>")
-set(CPACK_PACKAGE_VENDOR "http://www.tacc.utexas.edu/tacc-software/displaycluster")
+set(CPACK_PACKAGE_VENDOR "https://github.com/BlueBrain/Deflect")
 
 set(CPACK_COMPONENT_DESKTOPSTREAMER_DISPLAY_NAME "DesktopStreamer Application")
 set(CPACK_COMPONENT_DESKTOPSTREAMER_DESCRIPTION "DesktopStreamer is an application that lets you stream your desktop to a running DisplayCluster instance.")
-
-set(CPACK_COMPONENT_CORE_DISPLAY_NAME "DisplayCluster Application")
-set(CPACK_COMPONENT_DEV_DISPLAY_NAME "Development headers and libraries")
-set(CPACK_COMPONENT_DOC_DISPLAY_NAME "Documentation")
-
 set(CPACK_COMPONENT_DESKTOPSTREAMER_DEPENDS Deflect)
 
-# Currently we only package desktopstreamer
-set(CPACK_COMPONENTS_ALL desktopstreamer Deflect)
+# Currently we only package desktopstreamer and the Deflect library
+set(CPACK_COMPONENTS_ALL desktopstreamer lib)
 
 # Linux Debian specific settings
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt4-core, libqt4-gui, libqt4-network, libturbojpeg" )

CMakeLists.txt

@@ -12,7 +12,7 @@ include(GitExternal)
 
 set(VERSION_MAJOR "0")
 set(VERSION_MINOR "4")
-set(VERSION_PATCH "0")
+set(VERSION_PATCH "1")
 set(VERSION_ABI 1)
 
 set(DEFLECT_DESCRIPTION "The library to write applications for DisplayCluster")

apps/DesktopStreamer/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-# Copyright (c) 2013-2014, EPFL/Blue Brain Project
+# Copyright (c) 2013-2015, EPFL/Blue Brain Project
 #                     Raphael Dumusc <[email protected]>
 
 set(DESKTOPSTREAMER_MOC_HEADERS
@@ -39,8 +39,12 @@ if(APPLE)
     ${DESKTOPSTREAMER_SOURCES} ${MOC_OUTFILES} ${QRC_SOURCES}
     ${DESKTOPSTREAMER_ICON_FILE}) # include the icns file in the target
 
+  # Configure the bundle property file using current version and year
+  string(TIMESTAMP CURRENT_YEAR "%Y")
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
+    ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
   set_target_properties(${DESKTOPSTREAMER_APP_NAME} PROPERTIES
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
 
 elseif(WIN32)
   set(DESKTOPSTREAMER_APP_NAME desktopstreamer)
@@ -60,6 +64,7 @@ target_link_libraries(${DESKTOPSTREAMER_APP_NAME} ${DESKTOPSTREAMER_LINK_LIBRARI
 
 install(TARGETS ${DESKTOPSTREAMER_APP_NAME}
   RUNTIME DESTINATION bin COMPONENT desktopstreamer
-  BUNDLE DESTINATION . COMPONENT desktopstreamer)
+  BUNDLE DESTINATION . COMPONENT desktopstreamer
+)
 
 include(CPackConfig)

apps/DesktopStreamer/Info.plist → apps/DesktopStreamer/Info.plist.in

@@ -5,7 +5,7 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleExecutable</key>
-    <string>desktopstreamer</string>
+    <string>@DESKTOPSTREAMER_APP_NAME@</string>
     <key>CFBundleGetInfoString</key>
     <string></string>
     <key>CFBundleIconFile</key>
@@ -15,13 +15,13 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleLongVersionString</key>
-    <string>0.4.0</string>
+    <string>@VERSION@</string>
     <key>CFBundleName</key>
     <string></string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.4.0</string>
+    <string>@VERSION@</string>
     <key>CFBundleSignature</key>
     <string></string>
     <key>CFBundleVersion</key>
@@ -31,7 +31,7 @@
     <key>LSRequiresCarbon</key>
     <true/>
     <key>NSHumanReadableCopyright</key>
-    <string>EPFL/Blue Brain Project 2014</string>
+    <string>EPFL/Blue Brain Project @CURRENT_YEAR@</string>
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
     <key>NSHighResolutionCapable</key>

apps/DesktopStreamer/src/MainWindow.cpp

@@ -57,7 +57,7 @@
 #define SHARE_DESKTOP_UPDATE_DELAY      1
 #define FRAME_RATE_AVERAGE_NUM_FRAMES  10
 
-#define DEFAULT_HOST_ADDRESS  "bbplxviz03.epfl.ch"
+#define DEFAULT_HOST_ADDRESS  "bbpav02.epfl.ch"
 #define CURSOR_IMAGE_FILE     ":/cursor.png"
 
 MainWindow::MainWindow()