diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/Input/wildmidi/CMakeLists.txt | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 60752fcf7..135e258dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 2.6.0) #freebsd support include_directories(SYSTEM /usr/local/include) -#link_directories(/usr/local/lib) -#link_directories(/usr/local/lib32) -#link_directories(/usr/local/lib64) SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) #extract version from qmmp.h diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt index 66ff4b495..11292752a 100644 --- a/src/plugins/Input/wildmidi/CMakeLists.txt +++ b/src/plugins/Input/wildmidi/CMakeLists.txt @@ -49,11 +49,15 @@ SET(libwildmidi_MOC_HDRS # libwildmidi -CHECK_INCLUDE_FILE(wildmidi_lib.h WILDMIDI_FOUND) +CHECK_INCLUDE_FILE(wildmidi_lib.h WILDMIDI_HEADER_FOUND) +FIND_LIBRARY(WILDMIDI_LIB NAME WildMidi PATHS /usr/lib /usr/lib32 /usr/local/lib /usr/local/lib32) -IF(WILDMIDI_FOUND) +IF(WILDMIDI_HEADER_FOUND AND (NOT WILDMIDI_LIB MATCHES "^.*-NOTFOUND")) SET(WILDMIDI_FOUND TRUE CACHE INTERNAL "wildmidi") -ENDIF(WILDMIDI_FOUND) +MESSAGE(STATUS "Found WildMidi: ${WILDMIDI_LIB}") +ELSE(WILDMIDI_HEADER_FOUND AND (NOT WILDMIDI_LIB MATCHES "^.*-NOTFOUND")) +MESSAGE(STATUS "Could not find WildMidi library") +ENDIF(WILDMIDI_HEADER_FOUND AND (NOT WILDMIDI_LIB MATCHES "^.*-NOTFOUND")) SET(libwildmidi_RCCS translations/translations.qrc) @@ -77,6 +81,6 @@ IF(WILDMIDI_FOUND) ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_MOC_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS} ${libwildmidi_HDRS}) add_dependencies(wildmidi qmmp) -target_link_libraries(wildmidi ${QT_LIBRARIES} -lqmmp -lWildMidi) +target_link_libraries(wildmidi ${QT_LIBRARIES} -lqmmp ${WILDMIDI_LIB}) install(TARGETS wildmidi DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(WILDMIDI_FOUND) |