From 4bdc9e68cc092a5a445022cf07a561d884cb2a13 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 11 Aug 2015 09:32:14 +0000
Subject: fixed cmake support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5369 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/CMakeLists.txt      |  4 ++--
 src/plugins/Ui/qsui/CMakeLists.txt | 18 +++++-------------
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'src/plugins/Ui')

diff --git a/src/plugins/Ui/CMakeLists.txt b/src/plugins/Ui/CMakeLists.txt
index 7fb7deeb9..7670cdb56 100644
--- a/src/plugins/Ui/CMakeLists.txt
+++ b/src/plugins/Ui/CMakeLists.txt
@@ -1,9 +1,9 @@
 SET(USE_SKINNED TRUE CACHE BOOL "enable/disable skinned user interface")
 SET(USE_QSUI TRUE CACHE BOOL "enable/disable simple user interface (qsui)")
 
-IF(USE_SKINNED AND X11_FOUND)
+IF(USE_SKINNED)
 add_subdirectory(skinned)
-ENDIF(USE_SKINNED AND X11_FOUND)
+ENDIF(USE_SKINNED)
 
 IF(USE_QSUI)
 add_subdirectory(qsui)
diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt
index df4241a36..2918fa0fc 100644
--- a/src/plugins/Ui/qsui/CMakeLists.txt
+++ b/src/plugins/Ui/qsui/CMakeLists.txt
@@ -15,21 +15,12 @@ ADD_DEFINITIONS(-DQT_NO_DEBUG)
 ADD_DEFINITIONS(-DQT_SHARED)
 ADD_DEFINITIONS(-DQT_THREAD)
 
-IF(SVN_VERSION)
-ADD_DEFINITIONS(-DQMMP_PLUGIN_PACK_VERSION=\\\"${QMMP_PLUGIN_PACK_VERSION}-dev\\\")
-ELSE(SVN_VERSION)
-ADD_DEFINITIONS(-DQMMP_PLUGIN_PACK_VERSION=\\\"${QMMP_PLUGIN_PACK_VERSION}\\\")
-ENDIF(SVN_VERSION)
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-# libqmmp
-include_directories(${QMMP_INCLUDE_DIRS})
-link_directories( ${QMMP_LIBRARY_DIRS})
-
-# libqmmpui
-include_directories(${QMMPUI_INCLUDE_DIRS})
-link_directories( ${QMMPUI_LIBRARY_DIRS})
+# libqmmpui & libqmmp
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
 
 SET(libqsui_SRCS
@@ -94,5 +85,6 @@ QT4_WRAP_UI(libqsui_UIS_H ${libqsui_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 ADD_LIBRARY(qsui MODULE ${libqsui_SRCS} ${libqsui_UIS_H} ${libqsui_RCC_SRCS} ${libqsui_HDRS})
+add_dependencies(qsui qmmpui libqmmp)
 target_link_libraries(qsui ${QT_LIBRARIES} ${QMMP_LDFLAGS} ${QMMPUI_LDFLAGS})
 install(TARGETS qsui DESTINATION ${LIB_DIR}/qmmp/Ui)
-- 
cgit v1.2.3-13-gbd6f