mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-29 16:50:11 +02:00
Code Issues Releases Wiki Activity

qt5: clean up Find modules and don't depend on Qt(4) in them anymore

Browse Source
This commit is contained in:
Dominik Schmidt
2013-01-05 16:41:06 +01:00
parent 74941e8aa4
commit 504c1aece2
4 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeModules/FindLibLastFm.cmake
View File

@@ -7,11 +7,6 @@
# (c) Dominik Schmidt <dev@dominik-schmidt.de> # (c) Dominik Schmidt <dev@dominik-schmidt.de>
# #
# Dependencies
if(NOT QT4_FOUND)
find_package(Qt4 REQUIRED)
endif()
# Include dir # Include dir
find_path(LIBLASTFM_INCLUDE_DIR find_path(LIBLASTFM_INCLUDE_DIR
# Track.h doesn't exist in liblastfm-0.3.1, was called Track back then # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then

31
CMakeModules/FindQJSON.cmake
View File

@@ -6,30 +6,16 @@
# QJSON_INCLUDE_DIR - the include path of the qjson library # QJSON_INCLUDE_DIR - the include path of the qjson library
# #
if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES) find_library (QJSON_LIBRARIES
# Already in cache
set (QJSON_FOUND TRUE)
else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
if (NOT WIN32)
# use pkg-config to get the values of QJSON_INCLUDE_DIRS
# and QJSON_LIBRARY_DIRS to add as hints to the find commands.
include (FindPkgConfig)
pkg_check_modules (QJSON REQUIRED QJson>=0.5)
endif (NOT WIN32)
find_library (QJSON_LIBRARIES
NAMES NAMES
qjson qjson
PATHS PATHS
${QJSON_LIBRARY_DIRS} ${QJSON_LIBRARY_DIRS}
${LIB_INSTALL_DIR} ${LIB_INSTALL_DIR}
${KDE4_LIB_DIR} ${KDE4_LIB_DIR}
) )
find_path (QJSON_INCLUDE_DIR find_path (QJSON_INCLUDE_DIR
NAMES NAMES
parser.h parser.h
PATH_SUFFIXES PATH_SUFFIXES
@@ -38,13 +24,8 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
${QJSON_INCLUDE_DIRS} ${QJSON_INCLUDE_DIRS}
${INCLUDE_INSTALL_DIR} ${INCLUDE_INSTALL_DIR}
${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR) find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
if ( UNIX AND NOT APPLE )
set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" CACHE INTERNAL "")
endif ()
endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)

3
CMakeModules/FindQTweetLib.cmake
View File

@@ -7,9 +7,6 @@
# (c) Dominik Schmidt <dev@dominik-schmidt.de> # (c) Dominik Schmidt <dev@dominik-schmidt.de>
# #
# Dependencies
find_package(Qt4 REQUIRED)
# Include dir # Include dir
find_path(QTWEETLIB_INCLUDE_DIR find_path(QTWEETLIB_INCLUDE_DIR
NAMES QTweetLib/qtweetlib_global.h NAMES QTweetLib/qtweetlib_global.h

5
CMakeModules/FindQuaZip.cmake
View File

@@ -1,4 +1,3 @@
find_package(Qt4)
find_path(QuaZip_INCLUDE_DIR quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include) find_path(QuaZip_INCLUDE_DIR quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}) find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR})
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
@@ -6,6 +5,6 @@ find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLU
set(QuaZip_LIBRARIES ${QuaZip_LIBRARY}) set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})
mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR) mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR) if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
set(QuaZip_FOUND TRUE) set(QuaZip_FOUND TRUE)
endif() endif()