Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove libSquish from repository. #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
endif()
endif()

find_package(LibSquish REQUIRED)
set_package_properties(LibSquish PROPERTIES
URL "https://sourceforge.net/projects/libsquish/"
DESCRIPTION "DXT Compression library"
TYPE REQUIRED
)

find_package(OpenGL REQUIRED)
set_package_properties(OpenGL PROPERTIES
DESCRIPTION "libGL and libGLU libraries"
Expand Down Expand Up @@ -71,9 +78,5 @@ include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${GLM_INCLUDE_DIRS})
include_directories(${ZLIB_INCLUDE_DIR})

# 3rd party Squish library for DXT codecs
include_directories(libsquish)
add_subdirectory(libsquish)

# The imaginaryMyst application
add_subdirectory(src)
30 changes: 30 additions & 0 deletions cmake/FindLibSquish.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#################################################
#
# Finds the open source DXT Library, Squish
#
# https://sourceforge.net/projects/libsquish/
#
#
# Supplies:
# LIBSQUISH_FOUND
# LIBSQUISH_INCLUDE_DIR
# LIBSQUISH_LIBRARIES
#

# Additional modules
include(FindPackageHandleStandardArgs)
include(SelectLibraryConfigurations)

set(LIBSQUISH_PATH CACHE PATH "Path to libSquish installation")

if(LIBSQUISH_PATH)
file(TO_CMAKE_PATH ${LIBSQUISH_PATH}/include LIBSQUISH_INC_SEARCH )
file(TO_CMAKE_PATH ${LIBSQUISH_PATH}/lib LIBSQUISH_LIB_SEARCH)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found some more tabs...

endif(LIBSQUISH_PATH)

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")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should probably be broken up with newlines to fit better on narrow editors / browsers.


select_library_configurations(LIBSQUISH)
find_package_handle_standard_args(LibSquish REQUIRED_VARS LIBSQUISH_LIBRARY LIBSQUISH_INCLUDE_DIR)
45 changes: 0 additions & 45 deletions libsquish/CMakeLists.txt

This file was deleted.

52 changes: 0 additions & 52 deletions libsquish/ChangeLog

This file was deleted.

223 changes: 0 additions & 223 deletions libsquish/Doxyfile

This file was deleted.

Loading