mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-15 10:33:59 +02:00
FindQuaZip.cmake: Make '5' version suffix permanent
This commit is contained in:
committed by
Dominik Schmidt
parent
333806ef4a
commit
bdc3238e6e
@@ -9,18 +9,15 @@ IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
|
|||||||
# in cache already
|
# in cache already
|
||||||
SET(QUAZIP_FOUND TRUE)
|
SET(QUAZIP_FOUND TRUE)
|
||||||
ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
|
ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
|
||||||
IF (Qt5Core_FOUND)
|
|
||||||
set(QUAZIP_LIB_VERSION_SUFFIX 5)
|
|
||||||
ENDIF()
|
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
FIND_PATH(QUAZIP_LIBRARY_DIR
|
FIND_PATH(QUAZIP_LIBRARY_DIR
|
||||||
WIN32_DEBUG_POSTFIX d
|
WIN32_DEBUG_POSTFIX d
|
||||||
NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
|
NAMES libquazip5.dll
|
||||||
HINTS "C:/Programme/" "C:/Program Files"
|
HINTS "C:/Programme/" "C:/Program Files"
|
||||||
PATH_SUFFIXES QuaZip/lib
|
PATH_SUFFIXES QuaZip/lib
|
||||||
)
|
)
|
||||||
FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR})
|
FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip5.dll HINTS ${QUAZIP_LIBRARY_DIR})
|
||||||
FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
|
FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip5)
|
||||||
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
|
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
|
||||||
ELSE(WIN32)
|
ELSE(WIN32)
|
||||||
FIND_PACKAGE(PkgConfig)
|
FIND_PACKAGE(PkgConfig)
|
||||||
@@ -28,12 +25,12 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
|
|||||||
pkg_check_modules(PC_QUAZIP quazip)
|
pkg_check_modules(PC_QUAZIP quazip)
|
||||||
FIND_LIBRARY(QUAZIP_LIBRARIES
|
FIND_LIBRARY(QUAZIP_LIBRARIES
|
||||||
WIN32_DEBUG_POSTFIX d
|
WIN32_DEBUG_POSTFIX d
|
||||||
NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
|
NAMES quazip5
|
||||||
HINTS /usr/lib /usr/lib64
|
HINTS /usr/lib /usr/lib64
|
||||||
)
|
)
|
||||||
FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
|
FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
|
||||||
HINTS /usr/include /usr/local/include
|
HINTS /usr/include /usr/local/include
|
||||||
PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
|
PATH_SUFFIXES quazip5
|
||||||
)
|
)
|
||||||
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
|
FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
|
||||||
ENDIF (WIN32)
|
ENDIF (WIN32)
|
||||||
|
Reference in New Issue
Block a user