Remove libSquish from repository. #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zrax
requested changes
Oct 24, 2018
CMakeLists.txt
Outdated
| @@ -30,6 +30,13 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") | |||
| endif() | |||
| endif() | |||
|
|
|||
| find_package(libSquish REQUIRED) | |||
There was a problem hiding this comment.
The case needs to match the Find*.cmake for case-sensitive OSes
There was a problem hiding this comment.
Good to know. I wasn't aware it did this search in a case-sensitive manner.
cmake/FindLibSquish.cmake
Outdated
|
|
||
| find_path(LIBSQUISH_INCLUDE_DIR squish.h PATHS ${LIBSQUISH_INC_SEARCH} DOC "Path containing libSquish header") | ||
| find_library(LIBSQUISH_LIBRARY_RELEASE NAMES squish libsquish PATHS . squish .. ../squish ${LIBSQUISH_LIB_SEARCH} PATH_SUFFIXES lib DOC "Path to libSquish release library") | ||
| find_library(LIBSQUISH_LIBRARY_DEBUG NAMES squishd libsquishd PATHS . squish .. ../squish ${LIBSQUISH_LIB_SEARCH} PATH_SUFFIXES lib DOC "Path to libSquish debug library") |
There was a problem hiding this comment.
Searching in the current directory implies that we've recommended installed it into the source (or binary) dir. I feel like we should just have the default paths, plus the LIBSQUISH_*_SEARCH path.
Deledrius
force-pushed
the
rm_libsquish
branch
from
671f537 to
1d30f70
Compare
Uses CMake to find system LibSquish instead.
Deledrius
force-pushed
the
rm_libsquish
branch
from
1d30f70 to
c34d700
Compare
|
Merge conflicts have been resolved. |
zrax
reviewed
Oct 29, 2018
|
|
||
| if(LIBSQUISH_PATH) | ||
| file(TO_CMAKE_PATH ${LIBSQUISH_PATH}/include LIBSQUISH_INC_SEARCH ) | ||
| file(TO_CMAKE_PATH ${LIBSQUISH_PATH}/lib LIBSQUISH_LIB_SEARCH) |
|
|
||
| find_path(LIBSQUISH_INCLUDE_DIR squish.h PATHS ${LIBSQUISH_INC_SEARCH} DOC "Path containing libSquish header") | ||
| find_library(LIBSQUISH_LIBRARY_RELEASE NAMES squish libsquish PATHS ${LIBSQUISH_LIB_SEARCH} PATH_SUFFIXES lib DOC "Path to libSquish release library") | ||
| find_library(LIBSQUISH_LIBRARY_DEBUG NAMES squishd libsquishd PATHS ${LIBSQUISH_LIB_SEARCH} PATH_SUFFIXES lib DOC "Path to libSquish debug library") |
There was a problem hiding this comment.
These should probably be broken up with newlines to fit better on narrow editors / browsers.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uses CMake to find libSquish instead.