ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Add option to use system Squish library

Browse Source 
The system version was preferred before but it wasn't possible to
explicitly disable it, making its use automagic, which is bad for
packaging.
This commit is contained in:
James Le Cuirot 2019-05-13 22:51:21 +01:00
parent 86bc8bd877
commit e1601b1ae0
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -31,6 +31,8 @@ CMAKE_DEPENDENT_OPTION(BUILD_RECORDER "Build opengl recorder" ON
"NOT SERVER_ONLY;NOT APPLE" OFF) "NOT SERVER_ONLY;NOT APPLE" OFF)
CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON CMAKE_DEPENDENT_OPTION(USE_FRIBIDI "Support for right-to-left languages" ON
"NOT SERVER_ONLY" OFF) "NOT SERVER_ONLY" OFF)
CMAKE_DEPENDENT_OPTION(USE_SYSTEM_SQUISH "Use system Squish library instead of the built-in version, when available." ON
"NOT SERVER_ONLY" OFF)
CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON CMAKE_DEPENDENT_OPTION(USE_WIIUSE "Support for wiimote input devices" ON
"NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF) "NOT SERVER_ONLY;NOT MINGW;NOT CYGWIN" OFF)
@ -247,8 +249,10 @@ if(NOT SERVER_ONLY)
endif() endif()
if(NOT SERVER_ONLY) if(NOT SERVER_ONLY)
find_library(SQUISH_LIBRARY NAMES squish libsquish) if(USE_SYSTEM_SQUISH)
find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS) find_library(SQUISH_LIBRARY NAMES squish libsquish)
find_path(SQUISH_INCLUDEDIR NAMES squish.h PATHS)
endif()
if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR) if (NOT SQUISH_LIBRARY OR NOT SQUISH_INCLUDEDIR)
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish") add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libsquish")
include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish") include_directories("${PROJECT_SOURCE_DIR}/lib/libsquish")