mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 06:36:55 +02:00
Code Issues Releases Wiki Activity

* Style fixes for build system.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-06-05 09:15:07 +02:00
parent e1a2b4baa0
commit d6ae691edc
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tomahawk/CMakeLists.osx.cmake
View File

@@ -16,14 +16,14 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
) )
if (APPLE) if( APPLE )
# find_library(GROWL Growl) # find_library(GROWL Growl)
option(ENABLE_SPARKLE "Sparkle updating" ON) option(ENABLE_SPARKLE "Sparkle updating" ON)
find_library(SPARKLE Sparkle) find_library(SPARKLE Sparkle)
if (ENABLE_SPARKLE AND SPARKLE) if( ENABLE_SPARKLE AND SPARKLE )
set(HAVE_SPARKLE ON) set(HAVE_SPARKLE ON)
set( OS_SPECIFIC_LINK_LIBRARIES ${OS_SPECIFIC_LINK_LIBRARIES} ${SPARKLE} ) set( OS_SPECIFIC_LINK_LIBRARIES ${OS_SPECIFIC_LINK_LIBRARIES} ${SPARKLE} )
endif(ENABLE_SPARKLE AND SPARKLE) endif( ENABLE_SPARKLE AND SPARKLE )
# Uses Darwin kernel version. # Uses Darwin kernel version.
# 9.8.0 -> 10.5/Leopard # 9.8.0 -> 10.5/Leopard
# 10.4.0 -> 10.6/Snow Leopard # 10.4.0 -> 10.6/Snow Leopard

24
src/tomahawk/CMakeLists.txt
View File

@@ -32,11 +32,11 @@ IF( WITH_GNOMESHORTCUTHANDLER )
qt4_add_dbus_interface(tomahawkSources GnomeSettingsDaemonMediaKeys.xml GnomeSettingsDaemonMediaKeysProxy) qt4_add_dbus_interface(tomahawkSources GnomeSettingsDaemonMediaKeys.xml GnomeSettingsDaemonMediaKeysProxy)
ENDIF( WITH_GNOMESHORTCUTHANDLER ) ENDIF( WITH_GNOMESHORTCUTHANDLER )
IF(LIBLASTFM_FOUND) IF( LIBLASTFM_FOUND )
SET(tomahawkSources ${tomahawkSources} SET(tomahawkSources ${tomahawkSources}
Scrobbler.cpp Scrobbler.cpp
) )
ENDIF(LIBLASTFM_FOUND) ENDIF( LIBLASTFM_FOUND )
SET( tomahawkSourcesGui ${tomahawkSourcesGui} SET( tomahawkSourcesGui ${tomahawkSourcesGui}
sourcetree/SourcesModel.cpp sourcetree/SourcesModel.cpp
@@ -111,7 +111,7 @@ INCLUDE_DIRECTORIES(
${LIBLASTFM_INCLUDE_DIRS} ${LIBLASTFM_INCLUDE_DIRS}
) )
IF(QXTWEB_FOUND) IF( QXTWEB_FOUND )
LIST(APPEND tomahawkSources web/Api_v1.cpp) LIST(APPEND tomahawkSources web/Api_v1.cpp)
LIST(APPEND LINK_LIBRARIES ${QXTWEB_LIBRARIES}) LIST(APPEND LINK_LIBRARIES ${QXTWEB_LIBRARIES})
INCLUDE_DIRECTORIES(${QXTWEB_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${QXTWEB_INCLUDE_DIRS})
@@ -134,9 +134,9 @@ IF( APPLE )
SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp ) SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp )
ENDIF( APPLE ) ENDIF( APPLE )
IF(QCA2_FOUND) IF( QCA2_FOUND )
INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
ENDIF(QCA2_FOUND) ENDIF( QCA2_FOUND )
INCLUDE(GNUInstallDirs) INCLUDE(GNUInstallDirs)
@@ -175,13 +175,13 @@ qt5_use_modules(tomahawk Core Widgets Network Sql WebKitWidgets)
MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" ) MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
IF(LIBLASTFM_FOUND) IF( LIBLASTFM_FOUND )
LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBLASTFM_LIBRARIES} ) LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBLASTFM_LIBRARIES} )
ENDIF(LIBLASTFM_FOUND) ENDIF( LIBLASTFM_FOUND )
IF(QCA2_FOUND) IF( QCA2_FOUND )
LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} ) LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
ENDIF(QCA2_FOUND) ENDIF( QCA2_FOUND )
IF(WITH_BREAKPAD) IF( WITH_BREAKPAD )
LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_breakpad ) LIST(APPEND LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_breakpad )
ENDIF() ENDIF()
@@ -198,11 +198,11 @@ TARGET_LINK_LIBRARIES( tomahawk
) )
IF( APPLE ) IF( APPLE )
IF(HAVE_SPARKLE) IF( HAVE_SPARKLE )
MESSAGE("Sparkle Found, installing framekwork in bundle") 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( HAVE_SPARKLE )
ENDIF( APPLE ) ENDIF( APPLE )
INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )