Make CMake build Tomahawk.app instead of tomahawk.app

CMakeLists.txt

@@ -20,6 +20,11 @@ SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" )
 SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
 SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
+IF(APPLE)
+    SET( TOMAHAWK_TARGET_NAME "Tomahawk" )
+ELSE()
+    SET( TOMAHAWK_TARGET_NAME "tomahawk" )
+ENDIF()
 
 IF( WIN32 )
     SET( TOMAHAWK_SYSTEM "Windows" )
@@ -235,7 +240,8 @@ else( Qt5Core_DIR )
 endif( Qt5Core_DIR )
 
 if( BUILD_GUI AND UNIX AND NOT APPLE )
-    find_package( X11 )
+    macro_optional_find_package( X11 )
+    macro_log_feature(X11_FOUND "X11" "The Xorg libraries" "http://www.x.org/wiki/" TRUE "" "Xorg libraries are used by libqnetwm to bring windows to front reliably")
 endif()
 
 # Check if we can use <functional> or need <tr1/functional>

src/tomahawk/CMakeLists.osx.cmake

@@ -59,9 +59,9 @@ if( APPLE )
   FILE( WRITE ${CMAKE_BINARY_DIR}/Info.plist "${edited_plist}" )
 
   FILE(COPY ${CMAKE_SOURCE_DIR}/admin/mac/sparkle_pub.pem
-    DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources")
+    DESTINATION "${CMAKE_BINARY_DIR}/Tomahawk.app/Contents/Resources")
 
-  FILE(COPY /usr/bin/SetFile DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/MacOS")
-  FILE(COPY /usr/bin/GetFileInfo DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/MacOS")
+  FILE(COPY /usr/bin/SetFile DESTINATION "${CMAKE_BINARY_DIR}/Tomahawk.app/Contents/MacOS")
+  FILE(COPY /usr/bin/GetFileInfo DESTINATION "${CMAKE_BINARY_DIR}/Tomahawk.app/Contents/MacOS")
 
 endif (APPLE)

src/tomahawk/CMakeLists.txt

@@ -151,13 +151,18 @@ qt_add_resources( RC_SRCS "../../resources.qrc" )
 
 SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )
 
+if(APPLE)
+    set(TOMAHAWK_RUNTIME_OUTPUT_NAME "Tomahawk")
+else()
+    set(TOMAHAWK_RUNTIME_OUTPUT_NAME "tomahawk")
+endif()
 
 ADD_EXECUTABLE( tomahawk_bin WIN32 MACOSX_BUNDLE ${final_src} )
 SET_TARGET_PROPERTIES(tomahawk_bin
     PROPERTIES
         AUTOMOC TRUE
         MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist"
-        RUNTIME_OUTPUT_NAME tomahawk
+        RUNTIME_OUTPUT_NAME ${TOMAHAWK_RUNTIME_OUTPUT_NAME}
 )
 
 
@@ -194,7 +199,7 @@ TARGET_LINK_LIBRARIES( tomahawk_bin
 IF( APPLE )
   IF( HAVE_SPARKLE )
     MESSAGE("Sparkle Found, installing framekwork in bundle")
-    INSTALL(DIRECTORY "${SPARKLE}/Versions/Current/Resources" DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Frameworks/Sparkle.framework")
+    INSTALL(DIRECTORY "${SPARKLE}/Versions/Current/Resources" DESTINATION "${CMAKE_BINARY_DIR}/Tomahawk.app/Contents/Frameworks/Sparkle.framework")
 
   ENDIF( HAVE_SPARKLE )
 ENDIF( APPLE )