diff options
| author | Denton Woods <denton.woods@gmail.com> | 2016-12-31 15:52:56 -0600 |
|---|---|---|
| committer | Denton Woods <denton.woods@gmail.com> | 2016-12-31 15:52:56 -0600 |
| commit | f28c2ded379ef61d708fe0d85ea6e4269407d785 (patch) | |
| tree | e02e8db1bd6201b0b7c32d7aa95827205737e1e4 | |
| parent | 70181276bf4530464d42fc854d903ca7c490a305 (diff) | |
| download | devil-f28c2ded379ef61d708fe0d85ea6e4269407d785.tar.gz | |
- Adding support for libsquish to CMake
| -rw-r--r-- | DevIL/cmake/Modules/FindlibSquish.cmake | 14 | ||||
| -rw-r--r-- | DevIL/src-IL/CMakeLists.txt | 16 | ||||
| -rwxr-xr-x | DevIL/src-IL/src/il_iff.cpp | 2 |
3 files changed, 27 insertions, 5 deletions
diff --git a/DevIL/cmake/Modules/FindlibSquish.cmake b/DevIL/cmake/Modules/FindlibSquish.cmake new file mode 100644 index 00000000..a8d7cfed --- /dev/null +++ b/DevIL/cmake/Modules/FindlibSquish.cmake @@ -0,0 +1,14 @@ +# Defines +# LIBSQUISH_FOUND +# LIBSQUISH_INCLUDE_DIR +# LIBSQUISH_LIBRARIES + +FIND_PATH(LIBSQUISH_INCLUDE_DIR squish.h PATHS . squish .. ../squish DOC "Directory containing libSquish headers") +FIND_LIBRARY(LIBSQUISH_LIBRARY NAMES squish libsquish PATHS . squish .. ../squish PATH_SUFFIXES lib lib64 release minsizerel relwithdebinfo DOC "Path to libSquish library") + +SET(LIBSQUISH_LIBRARIES ${LIBSQUISH_LIBRARY}) + +IF (LIBSQUISH_LIBRARY AND LIBSQUISH_INCLUDE_DIR) + SET(LIBSQUISH_FOUND TRUE) + MESSAGE(STATUS "Found libSquish: ${LIBSQUISH_LIBRARY}") +ENDIF (LIBSQUISH_LIBRARY AND LIBSQUISH_INCLUDE_DIR) diff --git a/DevIL/src-IL/CMakeLists.txt b/DevIL/src-IL/CMakeLists.txt index 24b57a74..15527614 100644 --- a/DevIL/src-IL/CMakeLists.txt +++ b/DevIL/src-IL/CMakeLists.txt @@ -8,6 +8,9 @@ include (TestBigEndian) option(BUILD_SHARED_LIBS "Build with shared (.DLL .SO) libraries." ON) +# libSquish not currently supported by CMake +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + file(GLOB DevIL_SRCS src/*.cpp) file(GLOB DevIL_INC include/*.h ../include/config.h ../include/IL/devil_internal_exports.h ../include/IL/il.h) file(GLOB DevIL_RSRC) @@ -71,7 +74,8 @@ find_package(PNG) find_package(TIFF) find_package(JPEG) find_package(Jasper) -find_package(Squish) +#find_package(Squish) +find_package(libSquish) find_package(NVTT) # NVidia texture tools find_package(OpenEXR) find_package(LCMS) @@ -135,11 +139,11 @@ else(NVTT_FOUND) set(IL_USE_DXTC_NVIDIA 0) endif(NVTT_FOUND) -if(SQUISH_FOUND) +if(LIBSQUISH_FOUND) option(IL_USE_DXTC_SQUISH "Use libsquish for DXTC support" 1) -else(SQUISH_FOUND) +else(LIBSQUISH_FOUND) set(IL_USE_DXTC_SQUISH 0) -endif(SQUISH_FOUND) +endif(LIBSQUISH_FOUND) # Sets the output folders set(LIBDIR "../lib/") @@ -215,6 +219,10 @@ if(IL_USE_DXTC_NVIDIA) endif(IL_USE_DXTC_NVIDIA) # TODO: does Squish require linking/includes? +if(IL_USE_DXTC_SQUISH) + list(APPEND incs ${LIBSQUISH_INCLUDE_DIR} ) + list(APPEND libs ${LIBSQUISH_LIBRARY} ) +endif(IL_USE_DXTC_SQUISH) include_directories(${incs}) diff --git a/DevIL/src-IL/src/il_iff.cpp b/DevIL/src-IL/src/il_iff.cpp index d4a2afeb..c7ade047 100755 --- a/DevIL/src-IL/src/il_iff.cpp +++ b/DevIL/src-IL/src/il_iff.cpp @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- // // ImageLib Sources -// Last modified: 03/0/2009 +// Last modified: 03/01/2009 // // Filename: src-IL/src/il_iff.cpp // |