From 315a029af6b99ca6bc97bb45e89827d788ea4482 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 13 Nov 2015 05:47:58 +0000 Subject: fixed macports libraries detection on MacOS X (Ivan Ponomarev) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5766 90c681e8-e032-0410-971d-27865f9a5e38 --- CMakeLists.txt | 5 +++++ src/plugins/Ui/qsui/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d7501d69..556f7d823 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,11 @@ cmake_minimum_required(VERSION 2.8.6 FATAL_ERROR) include_directories(SYSTEM /usr/local/include) SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) +#macports support +IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /opt/local/include) +ENDIF() + #extract version from qmmp.h FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt index 2918fa0fc..fe6510015 100644 --- a/src/plugins/Ui/qsui/CMakeLists.txt +++ b/src/plugins/Ui/qsui/CMakeLists.txt @@ -86,5 +86,5 @@ 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}) +target_link_libraries(qsui ${QT_LIBRARIES} -lqmmpui -lqmmp) install(TARGETS qsui DESTINATION ${LIB_DIR}/qmmp/Ui) -- cgit v1.2.3-13-gbd6f