mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-01-16 22:08:17 +01:00
Code Issues Releases Wiki Activity

Fix weird OSX target names

Browse Source
This commit is contained in:
Dominik Schmidt 2015-10-11 00:00:40 +02:00
parent 1758a7aeef
commit 731973076d
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -27,6 +27,8 @@ ELSE()
SET( TOMAHAWK_TARGET_NAME "tomahawk" ) SET( TOMAHAWK_TARGET_NAME "tomahawk" )
ENDIF() ENDIF()
STRING(TOLOWER "${TOMAHAWK_TARGET_NAME}" TOMAHAWK_BASE_TARGET_NAME)
IF( WIN32 ) IF( WIN32 )
SET( TOMAHAWK_SYSTEM "Windows" ) SET( TOMAHAWK_SYSTEM "Windows" )
ELSEIF( APPLE ) ELSEIF( APPLE )
@ -481,10 +483,10 @@ configure_file(TomahawkUse.cmake.in "${PROJECT_BINARY_DIR}/TomahawkUse.cmake" @O
file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}") file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}") file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}")
SET( TOMAHAWK_LIBRARY ${TOMAHAWK_TARGET_NAME}lib ) SET( TOMAHAWK_LIBRARY ${TOMAHAWK_BASE_TARGET_NAME}lib )
SET( TOMAHAWK_LIBRARIES ${TOMAHAWK_LIBRARY} ) SET( TOMAHAWK_LIBRARIES ${TOMAHAWK_LIBRARY} )
SET( TOMAHAWK_WIDGETS_LIBRARIES ${TOMAHAWK_TARGET_NAME}-widgets ) SET( TOMAHAWK_WIDGETS_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-widgets )
SET( TOMAHAWK_PLAYDARAPI_LIBRARIES ${TOMAHAWK_TARGET_NAME}-playdarapi ) SET( TOMAHAWK_PLAYDARAPI_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-playdarapi )
ADD_SUBDIRECTORY( thirdparty ) ADD_SUBDIRECTORY( thirdparty )
ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( src )

2
TomahawkAddPlugin.cmake
View File

@ -19,7 +19,7 @@ function(tomahawk_add_plugin)
# message("NO_INSTALL: ${PLUGIN_NO_INSTALL}") # message("NO_INSTALL: ${PLUGIN_NO_INSTALL}")
# create target name once for convenience # create target name once for convenience
set(target "${TOMAHAWK_TARGET_NAME}_${PLUGIN_TYPE}_${PLUGIN_NAME}") set(target "${TOMAHAWK_BASE_TARGET_NAME}_${PLUGIN_TYPE}_${PLUGIN_NAME}")
# create option to disable plugins # create option to disable plugins
string(TOUPPER "${PLUGIN_TYPE}" PLUGIN_TYPE_UPPER) string(TOUPPER "${PLUGIN_TYPE}" PLUGIN_TYPE_UPPER)

2
src/accounts/google/CMakeLists.txt
View File

@ -10,5 +10,5 @@ tomahawk_add_plugin(google
SOURCES SOURCES
GoogleWrapper.cpp GoogleWrapper.cpp
LINK_LIBRARIES LINK_LIBRARIES
${TOMAHAWK_TARGET_NAME}_account_xmpp ${TOMAHAWK_BASE_TARGET_NAME}_account_xmpp
) )

2
src/crashreporter/CMakeLists.txt
View File

@ -1,7 +1,7 @@
PROJECT( CrashReporter ) PROJECT( CrashReporter )
cmake_policy(SET CMP0017 NEW) cmake_policy(SET CMP0017 NEW)
set(TOMAHAWK_CRASH_REPORTER_TARGET ${TOMAHAWK_TARGET_NAME}_crash_reporter) set(TOMAHAWK_CRASH_REPORTER_TARGET ${TOMAHAWK_BASE_TARGET_NAME}_crash_reporter)
setup_qt() setup_qt()

2
src/libtomahawk-playdarapi/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET ${TOMAHAWK_TARGET_NAME}-playdarapi) set(TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET ${TOMAHAWK_BASE_TARGET_NAME}-playdarapi)
list(APPEND ${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}_SOURCES list(APPEND ${TOMAHAWK_PLAYDARAPI_LIBRARY_TARGET}_SOURCES
Api_v1.cpp Api_v1.cpp

2
src/libtomahawk-widgets/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(TOMAHAWK_WIDGETS_LIBRARY_TARGET ${TOMAHAWK_TARGET_NAME}-widgets) set(TOMAHAWK_WIDGETS_LIBRARY_TARGET ${TOMAHAWK_BASE_TARGET_NAME}-widgets)
list(APPEND ${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_SOURCES list(APPEND ${TOMAHAWK_WIDGETS_LIBRARY_TARGET}_SOURCES
PlaylistDelegate.cpp PlaylistDelegate.cpp

2
src/libtomahawk/accounts/configstorage/telepathy/CMakeLists.txt
View File

@ -20,7 +20,7 @@ if( KDE4_FOUND )
SOURCES SOURCES
KdeTelepathyConfigWidget.cpp KdeTelepathyConfigWidget.cpp
LINK_LIBRARIES LINK_LIBRARIES
${TOMAHAWK_TARGET_NAME}_configstorage_telepathy ${TOMAHAWK_BASE_TARGET_NAME}_configstorage_telepathy
${KDE4_KCMUTILS_LIBS} ${KDE4_KCMUTILS_LIBS}
) )
endif() endif()

1
src/tomahawk/TomahawkVersion.h.in
View File

@ -5,6 +5,7 @@
#cmakedefine TOMAHAWK_ORGANIZATION_DOMAIN "${TOMAHAWK_ORGANIZATION_DOMAIN}" #cmakedefine TOMAHAWK_ORGANIZATION_DOMAIN "${TOMAHAWK_ORGANIZATION_DOMAIN}"
#cmakedefine TOMAHAWK_APPLICATION_NAME "${TOMAHAWK_APPLICATION_NAME}" #cmakedefine TOMAHAWK_APPLICATION_NAME "${TOMAHAWK_APPLICATION_NAME}"
#cmakedefine TOMAHAWK_TARGET_NAME "${TOMAHAWK_TARGET_NAME}" #cmakedefine TOMAHAWK_TARGET_NAME "${TOMAHAWK_TARGET_NAME}"
#cmakedefine TOMAHAWK_BASE_TARGET_NAME "${TOMAHAWK_BASE_TARGET_NAME}"
#cmakedefine TOMAHAWK_APPLICATION_PACKAGE_NAME "${TOMAHAWK_APPLICATION_PACKAGE_NAME}" #cmakedefine TOMAHAWK_APPLICATION_PACKAGE_NAME "${TOMAHAWK_APPLICATION_PACKAGE_NAME}"
#cmakedefine TOMAHAWK_VERSION "${TOMAHAWK_VERSION}" #cmakedefine TOMAHAWK_VERSION "${TOMAHAWK_VERSION}"
#cmakedefine TOMAHAWK_SYSTEM "${TOMAHAWK_SYSTEM}" #cmakedefine TOMAHAWK_SYSTEM "${TOMAHAWK_SYSTEM}"