From 4b77b9525ff4ade7bf7d98fa11d3f6b61fe45b22 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Wed, 30 Nov 2011 18:15:41 +0100 Subject: [PATCH] Don't install .protocol file anymore, if it's not enforced with LEGACY_KDE_INTEGRATION. Does anyone have Qt >= 4.7 and KDE =< 4.6.0 --- CMakeLists.txt | 1 + src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 070db4187..f1ca859c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ SET( TOMAHAWK_VERSION_PATCH 99 ) # build options option(BUILD_GUI "Build Tomahawk with GUI" ON) option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF) +option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF) # generate version string diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d56dcabc6..984150128 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -267,7 +267,7 @@ ENDIF( APPLE ) INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION bin ) -IF( UNIX AND NOT APPLE AND KDE4_INSTALLED ) #install protocol file +IF( UNIX AND NOT APPLE AND KDE4_INSTALLED AND LEGACY_KDE_INTEGRATION ) #install protocol file FILE( READ ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.protocol protocol ) STRING( REPLACE "/path/to/binary" # match this "${CMAKE_INSTALL_PREFIX}/bin/tomahawk" # this is linux (kde) so pretty safe I think