TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Update FindLibSquish.cmake, support looking in thirdparty dir

Browse Source
This commit is contained in:
rdb 2022-03-09 14:07:05 +01:00
parent 59f422c056
commit e716dba8d4
2 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmake/modules/FindLibSquish.cmake
View File

@ -14,8 +14,28 @@
# LIBSQUISH_DEBUG_LIBRARY - the filepath of the libsquish debug library # LIBSQUISH_DEBUG_LIBRARY - the filepath of the libsquish debug library
# #
# Find the libsquish include files if(LibSquish_ROOT)
find_path(LIBSQUISH_INCLUDE_DIR # Search exclusively under the root
find_path(LIBSQUISH_INCLUDE_DIR
NAMES "squish.h"
PATHS ${LibSquish_ROOT}
PATH_SUFFIXES "include"
)
find_library(LIBSQUISH_RELEASE_LIBRARY
NAMES "squish" "libsquish"
PATHS ${LibSquish_ROOT}
PATH_SUFFIXES "lib"
)
find_library(LIBSQUISH_DEBUG_LIBRARY
NAMES "squishd" "libsquishd"
PATHS ${LibSquish_ROOT}
PATH_SUFFIXES "lib"
)
else()
# Find the libsquish include files
find_path(LIBSQUISH_INCLUDE_DIR
NAMES "squish.h" NAMES "squish.h"
PATHS "/usr/include" PATHS "/usr/include"
"/usr/local/include" "/usr/local/include"
@ -24,10 +44,10 @@ find_path(LIBSQUISH_INCLUDE_DIR
"/opt/local/include" "/opt/local/include"
"/opt/csw/include" "/opt/csw/include"
PATH_SUFFIXES "" "cppunit" PATH_SUFFIXES "" "cppunit"
) )
# Find the libsquish library built for release # Find the libsquish library built for release
find_library(LIBSQUISH_RELEASE_LIBRARY find_library(LIBSQUISH_RELEASE_LIBRARY
NAMES "squish" "libsquish" NAMES "squish" "libsquish"
PATHS "/usr" PATHS "/usr"
"/usr/local" "/usr/local"
@ -36,10 +56,10 @@ find_library(LIBSQUISH_RELEASE_LIBRARY
"/opt" "/opt"
"/opt/csw" "/opt/csw"
PATH_SUFFIXES "lib" "lib32" "lib64" PATH_SUFFIXES "lib" "lib32" "lib64"
) )
# Find the libsquish library built for debug # Find the libsquish library built for debug
find_library(LIBSQUISH_DEBUG_LIBRARY find_library(LIBSQUISH_DEBUG_LIBRARY
NAMES "squishd" "libsquishd" NAMES "squishd" "libsquishd"
PATHS "/usr" PATHS "/usr"
"/usr/local" "/usr/local"
@ -48,8 +68,8 @@ find_library(LIBSQUISH_DEBUG_LIBRARY
"/opt" "/opt"
"/opt/csw" "/opt/csw"
PATH_SUFFIXES "lib" "lib32" "lib64" PATH_SUFFIXES "lib" "lib32" "lib64"
) )
endif()
mark_as_advanced(LIBSQUISH_INCLUDE_DIR) mark_as_advanced(LIBSQUISH_INCLUDE_DIR)
mark_as_advanced(LIBSQUISH_RELEASE_LIBRARY) mark_as_advanced(LIBSQUISH_RELEASE_LIBRARY)

2
dtool/Package.cmake
View File

@ -397,7 +397,7 @@ package_option(OpenEXR "Enable support for loading .exr images.")
package_status(OpenEXR "OpenEXR") package_status(OpenEXR "OpenEXR")
# libsquish # libsquish
find_package(LibSquish QUIET) find_package(LibSquish QUIET MODULE)
package_option(SQUISH package_option(SQUISH
"Enables support for automatic compression of DXT textures." "Enables support for automatic compression of DXT textures."