|
 |
a9c3d0d |
diff -rupN clementine-0.4.2.old/CMakeLists.txt clementine-0.4.2/CMakeLists.txt
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/CMakeLists.txt 2010-07-16 22:31:50.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/CMakeLists.txt 2010-07-16 22:42:41.000000000 -0400
|
|
|
a9c3d0d |
@@ -124,7 +124,7 @@ option(ENABLE_VISUALISATIONS "Use libpro
|
|
|
a9c3d0d |
option(BUNDLE_PROJECTM_PRESETS "Install Clementine's own copies of libprojectm presets - disable this if you want to use a system package instead" ON)
|
|
|
a9c3d0d |
if(ENABLE_VISUALISATIONS)
|
|
|
a9c3d0d |
# When/if upstream accepts our patches then these options can be used to link
|
|
|
a9c3d0d |
- # to system installed 3rdparty libraries instead.
|
|
|
a9c3d0d |
+ # to system installed projectM instead.
|
|
|
a9c3d0d |
option(USE_SYSTEM_PROJECTM "Don't set this option unless your system projectM library has been compiled with the Clementine patches in 3rdparty" OFF)
|
|
|
a9c3d0d |
if(USE_SYSTEM_PROJECTM)
|
|
|
a9c3d0d |
pkg_check_modules(LIBPROJECTM libprojectM)
|
|
|
a9c3d0d |
@@ -157,8 +157,19 @@ if(STATIC_SQLITE)
|
|
|
a9c3d0d |
add_subdirectory(3rdparty/qsqlite)
|
|
|
a9c3d0d |
endif(STATIC_SQLITE)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
+# When/if upstream accepts our patches then these options can be used to link
|
|
|
a9c3d0d |
+# to system installed qtsingleapplication instead.
|
|
|
a9c3d0d |
+option(USE_SYSTEM_QTSINGLEAPPLICATION "Don't set this option unless your system QtSingleApplication library has been compiled with the Clementine patches in 3rdparty" OFF)
|
|
|
a9c3d0d |
+if(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
|
a9c3d0d |
+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
|
|
|
a9c3d0d |
+ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
|
|
|
a9c3d0d |
+else(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
|
a9c3d0d |
+ add_subdirectory(3rdparty/qtsingleapplication)
|
|
|
a9c3d0d |
+ set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication)
|
|
|
a9c3d0d |
+ set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication)
|
|
|
a9c3d0d |
+endif(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
|
a9c3d0d |
+
|
|
|
a9c3d0d |
# Subdirectories
|
|
|
a9c3d0d |
-add_subdirectory(3rdparty/qtsingleapplication)
|
|
|
a9c3d0d |
add_subdirectory(3rdparty/qtiocompressor)
|
|
|
a9c3d0d |
add_subdirectory(src)
|
|
|
a9c3d0d |
if (NOT APPLE)
|
|
|
a9c3d0d |
diff -rupN clementine-0.4.2.old/src/CMakeLists.txt clementine-0.4.2/src/CMakeLists.txt
|
|
|
a9c3d0d |
--- clementine-0.4.2.old/src/CMakeLists.txt 2010-07-16 22:34:36.000000000 -0400
|
|
|
a9c3d0d |
+++ clementine-0.4.2/src/CMakeLists.txt 2010-07-16 22:43:28.000000000 -0400
|
|
|
a9c3d0d |
@@ -6,7 +6,6 @@ set(CMAKE_CXX_FLAGS "-Woverloaded-virtua
|
|
|
a9c3d0d |
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
a9c3d0d |
include_directories(${SPARKLE})
|
|
|
a9c3d0d |
include_directories(../3rdparty/gmock/gtest/include)
|
|
|
a9c3d0d |
-include_directories(../3rdparty/qtsingleapplication)
|
|
|
a9c3d0d |
include_directories(../3rdparty/qtiocompressor)
|
|
|
a9c3d0d |
include_directories(../3rdparty/qxt)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
@@ -14,6 +13,7 @@ include_directories(${GLIB_INCLUDE_DIRS}
|
|
|
a9c3d0d |
include_directories(${LIBXML_INCLUDE_DIRS})
|
|
|
a9c3d0d |
include_directories(${GOBJECT_INCLUDE_DIRS})
|
|
|
a9c3d0d |
include_directories(${LIBPROJECTM_INCLUDE_DIRS})
|
|
|
a9c3d0d |
+include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
cmake_policy(SET CMP0011 NEW)
|
|
|
a9c3d0d |
include(../cmake/AddEngine.cmake)
|
|
|
a9c3d0d |
@@ -449,7 +449,6 @@ add_library(clementine_lib STATIC
|
|
|
a9c3d0d |
add_dependencies(clementine_lib pot)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
target_link_libraries(clementine_lib
|
|
|
a9c3d0d |
- qtsingleapplication
|
|
|
a9c3d0d |
qtiocompressor
|
|
|
a9c3d0d |
chardet
|
|
|
a9c3d0d |
${GOBJECT_LIBRARIES}
|
|
|
a9c3d0d |
@@ -458,6 +457,7 @@ target_link_libraries(clementine_lib
|
|
|
a9c3d0d |
${QT_LIBRARIES}
|
|
|
a9c3d0d |
${ENGINE_LIBRARIES}
|
|
|
a9c3d0d |
${LASTFM_LIBRARIES}
|
|
|
a9c3d0d |
+ ${QTSINGLEAPPLICATION_LIBRARIES}
|
|
|
a9c3d0d |
)
|
|
|
a9c3d0d |
|
|
|
a9c3d0d |
if(ENABLE_VISUALISATIONS)
|