58 lines
2.7 KiB
Diff
58 lines
2.7 KiB
Diff
diff -up Yarock_0.9.64_11_source/CMakeLists.txt.system_libs Yarock_0.9.64_11_source/CMakeLists.txt
|
|
--- Yarock_0.9.64_11_source/CMakeLists.txt.system_libs 2013-11-02 04:24:55.000000000 -0500
|
|
+++ Yarock_0.9.64_11_source/CMakeLists.txt 2013-11-22 14:45:14.457325461 -0600
|
|
@@ -75,10 +75,29 @@ INCLUDE_DIRECTORIES( ${QJSON_INCLUDE_DIR
|
|
# ------------------------------------------------------------------------------
|
|
# SUBDIRECTORIES
|
|
# ------------------------------------------------------------------------------
|
|
-add_subdirectory(src3party/qtsingleapplication)
|
|
-add_subdirectory(src3party/qxt)
|
|
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qtsingleapplication)
|
|
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qxt)
|
|
+option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication library." OFF)
|
|
+if(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
|
|
+ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
|
|
+ find_library(QTSINGLECOREAPPLICATION_LIBRARIES QtSolutions_SingleCoreApplication-2.6)
|
|
+else(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
+ add_subdirectory(src3party/qtsingleapplication)
|
|
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qtsingleapplication)
|
|
+ set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication)
|
|
+endif(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
+
|
|
+option(USE_SYSTEM_QXT "Use system Qxt library" OFF)
|
|
+if (USE_SYSTEM_QXT)
|
|
+ find_path(QXTCORE_INCLUDE_DIRS qxtglobal.h PATH_SUFFIXES QxtCore)
|
|
+ find_path(QXTGUI_INCLUDE_DIRS qxtglobalshortcut.h PATH_SUFFIXES QxtGui)
|
|
+ set(QXT_INCLUDE_DIRS ${QXTCORE_INCLUDE_DIRS} ${QXTGUI_INCLUDE_DIRS})
|
|
+ # We only need its header. We don't need to link to QxtCore.
|
|
+ find_library(QXT_LIBRARIES QxtGui)
|
|
+else (USE_SYSTEM_QXT)
|
|
+ add_subdirectory(src3party/qxt)
|
|
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qxt)
|
|
+ set(QXT_LIBRARIES qxt)
|
|
+endif (USE_SYSTEM_QXT)
|
|
|
|
# Use system libechonest if it's available
|
|
if(NOT ECHONEST_FOUND)
|
|
@@ -127,4 +146,4 @@ install(FILES icon/128x128/yarock.png DE
|
|
# UN-INSTALL SUPPORT
|
|
# ------------------------------------------------------------------------------
|
|
|
|
-
|
|
\ No newline at end of file
|
|
+
|
|
diff -up Yarock_0.9.64_11_source/src/CMakeLists.txt.system_libs Yarock_0.9.64_11_source/src/CMakeLists.txt
|
|
--- Yarock_0.9.64_11_source/src/CMakeLists.txt.system_libs 2013-11-22 14:39:03.374103112 -0600
|
|
+++ Yarock_0.9.64_11_source/src/CMakeLists.txt 2013-11-22 14:45:24.992133011 -0600
|
|
@@ -391,8 +391,8 @@ TARGET_LINK_LIBRARIES(yarock
|
|
${TAGLIB_LIBRARIES}
|
|
${QJSON_LIBRARIES}
|
|
${ECHONEST_LIBRARIES}
|
|
- qtsingleapplication
|
|
- qxt
|
|
+ ${QTSINGLECOREAPPLICATION_LIBRARIES} ${QTSINGLEAPPLICATION_LIBRARIES}
|
|
+ ${QXT_LIBRARIES}
|
|
)
|
|
|
|
if (ENABLE_VLC)
|