Bring CMake integration up to date.

- Add a way to generate a FasTCConfig.cmake file so that you can
use cmake without having to install it.
- Add install paths for users that want to install it.
- Hide all public headers in FasTC/ qualified include path, this way we
know what files are public directly from the source. Also, it lets us
define build-tree and install-tree include directories a lot easier.

ASTCEncoder/CMakeLists.txt

@@ -51,12 +51,15 @@
 
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/ASTCEncoder/include)
 INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/ASTCEncoder/include)
-
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
 INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
 
+SET( LIBRARY_HEADERS
+  "include/FasTC/ASTCCompressor.h"
+)
+
 SET( HEADERS
-  include/ASTCCompressor.h
+  ${LIBRARY_HEADERS}
   src/IntegerEncoding.h
 )
 
@@ -75,5 +78,12 @@ ADD_LIBRARY( ASTCEncoder
   ${SOURCES}
 )
 
+INSTALL(
+  TARGETS ASTCEncoder
+  EXPORT FasTCTargets
+  ARCHIVE DESTINATION lib COMPONENT lib)
+INSTALL(
+  FILES ${LIBRARY_HEADERS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/FasTC COMPONENT dev)
+
 TARGET_LINK_LIBRARIES( ASTCEncoder FasTCBase )
-TARGET_LINK_LIBRARIES( ASTCEncoder FasTCIO )

ASTCEncoder/include/FasTC/ASTCCompressor.h

@@ -53,7 +53,7 @@
 #ifndef ASTCENCODER_INCLUDE_ASTCCOMPRESSOR_H_
 #define ASTCENCODER_INCLUDE_ASTCCOMPRESSOR_H_
 
-#include "CompressionJob.h"
+#include "FasTC/CompressionJob.h"
 
 namespace ASTCC {
 

ASTCEncoder/src/Decompressor.cpp

@@ -50,7 +50,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "ASTCCompressor.h"
+#include "FasTC/ASTCCompressor.h"
 
 #include <algorithm>
 #include <cassert>
@@ -60,13 +60,13 @@
 #include "Utils.h"
 #include "IntegerEncoding.h"
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
-#include "Bits.h"
-#include "BitStream.h"
+#include "FasTC/Bits.h"
+#include "FasTC/BitStream.h"
 using FasTC::BitStreamReadOnly;
 
-#include "Pixel.h"
+#include "FasTC/Pixel.h"
 
 namespace ASTCC {
 

ASTCEncoder/src/IntegerEncoding.cpp

@@ -50,22 +50,22 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "ASTCCompressor.h"
+#include "FasTC/ASTCCompressor.h"
 
 #include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <vector>
 
-#include "Utils.h"
-#include "IntegerEncoding.h"
-
-#include "Bits.h"
+#include "FasTC/Bits.h"
 using FasTC::Bits;
 
-#include "BitStream.h"
+#include "FasTC/BitStream.h"
 using FasTC::BitStreamReadOnly;
 
+#include "Utils.h"
+#include "IntegerEncoding.h"
+
 namespace ASTCC {
 
   // Returns the number of bits required to encode nVals values.

ASTCEncoder/src/IntegerEncoding.h

@@ -53,7 +53,7 @@
 #ifndef _ASTCENCODER_SRC_INTEGERENCODING_H_
 #define _ASTCENCODER_SRC_INTEGERENCODING_H_
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
 // Forward declares
 namespace FasTC {

ASTCEncoder/src/Utils.h

@@ -53,11 +53,11 @@
 #ifndef ASTCENCODER_SRC_UTILS_H_
 #define ASTCENCODER_SRC_UTILS_H_
 
-#include "ASTCCompressor.h"
+#include "FasTC/ASTCCompressor.h"
 
-#include "TexCompTypes.h"
-#include "CompressionFormat.h"
-#include "Pixel.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/CompressionFormat.h"
+#include "FasTC/Pixel.h"
 
 namespace ASTCC {
 

ASTCEncoder/test/CMakeLists.txt

@@ -105,6 +105,7 @@ ENDFOREACH()
 INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/IO/include )
 INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/IO/include )
 INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Core/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/Core/include )
 
 # HACK for MSVC 2012...
 IF(MSVC)

ASTCEncoder/test/TestASTCDecompression.cpp

@@ -53,10 +53,10 @@
 #include "gtest/gtest.h"
 
 // This is our library header
-#include "ASTCCompressor.h"
+#include "FasTC/ASTCCompressor.h"
 
-#include "ImageFile.h"
-#include "Image.h"
+#include "FasTC/ImageFile.h"
+#include "FasTC/Image.h"
 
 #include <string>
 

BPTCEncoder/CMakeLists.txt

@@ -40,12 +40,6 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
-INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
-
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/BPTCEncoder/include)
-INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/BPTCEncoder/include)
-
 IF(NOT "" STREQUAL "${AVPCLLIB_ROOT}")
   INCLUDE_DIRECTORIES(${AVPCLLIB_INCLUDE_DIR})
   SET(FOUND_NVTT_BPTC_EXPORT TRUE)
@@ -100,16 +94,20 @@ ENDIF()
 
 CONFIGURE_FILE(
   "config/BPTCConfig.h.in"
-  "include/BPTCConfig.h"
+  "include/FasTC/BPTCConfig.h"
+)
+
+SET(LIBRARY_HEADERS
+  "include/FasTC/BPTCCompressor.h"
+  "include/FasTC/Shapes.h"
 )
 
 SET( HEADERS
   config/BPTCConfig.h.in
-  include/BPTCCompressor.h
-  include/Shapes.h
   src/CompressionMode.h
   src/RGBAEndpoints.h
   src/ParallelStage.h
+  ${LIBRARY_HEADERS}
 )
 
 SET( SOURCES
@@ -162,11 +160,24 @@ IF(NOT "" STREQUAL "${AVPCLLIB_ROOT}")
   )
 ENDIF()
 
+SET(BPTC_INCLUDES_DIR ${FasTC_BINARY_DIR}/BPTCEncoder/include/FasTC)
+
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
+INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/BPTCEncoder/include)
+INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/BPTCEncoder/include)
+
 ADD_LIBRARY( BPTCEncoder
   ${HEADERS}
   ${SOURCES}
 )
 
+INSTALL(TARGETS BPTCEncoder EXPORT FasTCTargets ARCHIVE DESTINATION lib COMPONENT lib)
+INSTALL(
+  FILES ${LIBRARY_HEADERS} "${BPTC_INCLUDES_DIR}/BPTCConfig.h"
+  DESTINATION ${INCLUDE_INSTALL_DIR}/FasTC
+  COMPONENT dev)
+
 TARGET_LINK_LIBRARIES( BPTCEncoder FasTCBase )
 
 IF(NOT "" STREQUAL "${AVPCLLIB_ROOT}")

BPTCEncoder/include/FasTC/BPTCCompressor.h

@@ -76,8 +76,9 @@
 #ifndef BPTCENCODER_INCLUDE_BPTCCOMPRESSOR_H_
 #define BPTCENCODER_INCLUDE_BPTCCOMPRESSOR_H_
 
-#include "BPTCConfig.h"
-#include "CompressionJob.h"
+#include "FasTC/CompressionJob.h"
+
+#include "FasTC/BPTCConfig.h"
 
 #include <iosfwd>
 

BPTCEncoder/src/CompressNVTT.cpp

@@ -50,11 +50,12 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "BPTCCompressor.h"
+#include "FasTC/BPTCCompressor.h"
+
 #include "CompressionMode.h"
 #undef DBL_MAX
-#include "BitStream.h"
-#include "TexCompTypes.h"
+#include "FasTC/BitStream.h"
+#include "FasTC/TexCompTypes.h"
 
 #include <iostream>
 #include <sstream>

BPTCEncoder/src/Compressor.cpp

@@ -73,18 +73,20 @@
 //
 //------------------------------------------------------------------------------
 
-#include "BPTCCompressor.h"
-#include "CompressionMode.h"
+#include "FasTC/BPTCCompressor.h"
 
-#include "TexCompTypes.h"
-#include "BCLookupTables.h"
-#include "RGBAEndpoints.h"
-#include "Shapes.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/BitStream.h"
 
-#include "BitStream.h"
 using FasTC::BitStream;
 using FasTC::BitStreamReadOnly;
 
+#include "FasTC/Shapes.h"
+
+#include "CompressionMode.h"
+#include "BCLookupTables.h"
+#include "RGBAEndpoints.h"
+
 #ifdef HAS_MSVC_ATOMICS
 #   include "Windows.h"
 #endif

BPTCEncoder/src/ParallelStage.h

@@ -50,7 +50,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
 enum BPTCParallelStage {
   eParallelStage_Uniform,

BPTCEncoder/src/RGBAEndpoints.cpp

@@ -73,9 +73,10 @@
 //
 //------------------------------------------------------------------------------
 
-#include "BPTCConfig.h"
+#include "FasTC/BPTCConfig.h"
+#include "FasTC/BPTCCompressor.h"
+
 #include "RGBAEndpoints.h"
-#include "BPTCCompressor.h"
 #include "CompressionMode.h"
 
 #include <cassert>

BPTCEncoder/src/RGBAEndpoints.h

@@ -66,9 +66,11 @@
 #ifndef __RGBA_ENDPOINTS_H__
 #define __RGBA_ENDPOINTS_H__
 
-#include "TexCompTypes.h"
-#include "Vector4.h"
-#include "Matrix4x4.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/Vector4.h"
+#include "FasTC/Matrix4x4.h"
+
+#include "FasTC/Shapes.h"
 
 #include <algorithm>
 #include <cassert>
@@ -77,8 +79,6 @@
 #include <cstring>
 #include <limits>
 
-#include "Shapes.h"
-
 static const uint32 kNumColorChannels = 4;
 static const uint32 kMaxNumDataPoints = 16;
 

Base/CMakeLists.txt

@@ -67,8 +67,8 @@ CHECK_CXX_SOURCE_COMPILES("
 )
 
 CONFIGURE_FILE(
-  "config/FasTCBaseConfig.h.in"
-  "include/FasTCBaseConfig.h"
+  "config/BaseConfig.h.in"
+  "include/FasTC/BaseConfig.h"
 )
 
 SET( SOURCES
@@ -79,34 +79,50 @@ SET( SOURCES
   "src/Color.cpp"
 )
 
+SET( LIBRARY_HEADERS
+  "include/FasTC/Image.h"  
+  "include/FasTC/ImageFwd.h"
+  "include/FasTC/Pixel.h"
+  "include/FasTC/TexCompTypes.h"
+  "include/FasTC/CompressionFormat.h"
+  "include/FasTC/CompressionJob.h"
+  "include/FasTC/IPixel.h"
+  "include/FasTC/Color.h"
+  "include/FasTC/Bits.h"
+  "include/FasTC/BitStream.h"
+  "include/FasTC/MatrixBase.h"
+  "include/FasTC/MatrixSquare.h"
+  "include/FasTC/Matrix3x3.h"
+  "include/FasTC/Matrix4x4.h"
+  "include/FasTC/ScopedAllocator.h"
+  "include/FasTC/VectorBase.h"
+  "include/FasTC/Vector2.h"
+  "include/FasTC/Vector3.h"
+  "include/FasTC/Vector4.h")
+
 SET( HEADERS
-  "include/Bits.h"
-  "include/BitStream.h"
-  "include/Color.h"
-  "include/CompressionJob.h"
-  "config/FasTCBaseConfig.h.in"
-  "include/IPixel.h"
-  "include/Image.h"
-  "include/MatrixBase.h"
-  "include/MatrixSquare.h"
-  "include/Matrix3x3.h"
-  "include/Pixel.h"
-  "include/ScopedAllocator.h"
-  "include/TexCompTypes.h"
-  "include/VectorBase.h"
-  "include/Vector2.h"
-  "include/Vector3.h"
-  "include/Vector4.h"
+  ${LIBRARY_HEADERS}
+  "${FasTC_BINARY_DIR}/Base/include/FasTC/BaseConfig.h"
+  "config/BaseConfig.h.in"
 )
 
 INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
 INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
 
 ADD_LIBRARY( FasTCBase
-	${HEADERS}
-	${SOURCES}
+  ${HEADERS}
+  ${SOURCES}
 )
 
+INSTALL(
+  TARGETS FasTCBase
+  EXPORT FasTCTargets
+  ARCHIVE DESTINATION lib COMPONENT lib)
+
+INSTALL(
+  FILES ${LIBRARY_HEADERS} "${FasTC_BINARY_DIR}/Base/include/FasTC/BaseConfig.h"
+  DESTINATION ${INCLUDE_INSTALL_DIR}/FasTC COMPONENT dev)
+
 IF( NOT WIN32 AND NOT APPLE )
-  	TARGET_LINK_LIBRARIES( FasTCBase rt )
+  TARGET_LINK_LIBRARIES( FasTCBase rt )
 ENDIF()

Base/include/FasTC/CompressionFormat.h

@@ -53,7 +53,7 @@
 #ifndef _BASE_INCLUDE_COMPRESSIONFORMAT_H_
 #define _BASE_INCLUDE_COMPRESSIONFORMAT_H_
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
 namespace FasTC {
 

Base/include/FasTC/CompressionJob.h

@@ -53,8 +53,8 @@
 #ifndef __COMPRESSION_JOBS_H__
 #define __COMPRESSION_JOBS_H__
 
-#include "TexCompTypes.h"
-#include "CompressionFormat.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/CompressionFormat.h"
 
 #ifdef _MSC_VER
 #   define ALIGN(x) __declspec( align(x) )

Base/include/FasTC/Image.h

@@ -44,8 +44,8 @@
 #ifndef FASTC_BASE_INCLUDE_IMAGE_H_
 #define FASTC_BASE_INCLUDE_IMAGE_H_
 
-#include "TexCompTypes.h"
-#include "ImageFwd.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/ImageFwd.h"
 
 namespace FasTC {
 

Base/include/FasTC/TexCompTypes.h

@@ -57,7 +57,7 @@
 #ifndef _TEX_COMP_TYPES_H_
 #define _TEX_COMP_TYPES_H_
 
-#include "FasTCBaseConfig.h"
+#include "FasTC/BaseConfig.h"
 
 // Do we support C++11?
 #ifdef FASTC_BASE_HAS_CPP11_TYPES

Base/src/Color.cpp

@@ -50,7 +50,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "Color.h"
+#include "FasTC/Color.h"
 
 namespace FasTC {
 

Base/src/CompressionJob.cpp

@@ -41,7 +41,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "CompressionJob.h"
+#include "FasTC/CompressionJob.h"
 
 #include <new>
 #include <cstdlib>

Base/src/IPixel.cpp

@@ -50,8 +50,8 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "Pixel.h"
-#include "IPixel.h"
+#include "FasTC/Pixel.h"
+#include "FasTC/IPixel.h"
 
 namespace FasTC {
 

Base/src/Image.cpp

@@ -41,7 +41,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "Image.h"
+#include "FasTC/Image.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -50,9 +50,9 @@
 #include <cassert>
 #include <cmath>
 
-#include "Color.h"
-#include "Pixel.h"
-#include "IPixel.h"
+#include "FasTC/Color.h"
+#include "FasTC/Pixel.h"
+#include "FasTC/IPixel.h"
 
 template <typename T>
 static inline T sad( const T &a, const T &b ) {

Base/src/Pixel.cpp

@@ -50,13 +50,13 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "Pixel.h"
+#include "FasTC/Pixel.h"
 
 #include <cstring>
 #include <cassert>
 #include <algorithm>
 
-#include "Bits.h"
+#include "FasTC/Bits.h"
 
 template<typename T>
 static inline T Clamp(const T &v, const T &_min, const T &_max) {

Base/test/TestBits.cpp

@@ -51,7 +51,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "Bits.h"
+#include "FasTC/Bits.h"
 
 TEST(Bits, Replicate) {
   uint32 xv = 3;

Base/test/TestColor.cpp

@@ -51,7 +51,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "Color.h"
+#include "FasTC/Color.h"
 
 static const float kEpsilon = 1e-6f;
 

Base/test/TestImage.cpp

@@ -51,9 +51,9 @@
  */
 
 #include "gtest/gtest.h"
-#include "Image.h"
-#include "IPixel.h"
-#include "Pixel.h"
+#include "FasTC/Image.h"
+#include "FasTC/IPixel.h"
+#include "FasTC/Pixel.h"
 #include "Utils.h"
 
 #include <cstdlib>

Base/test/TestMatrix.cpp

@@ -51,7 +51,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "MatrixBase.h"
+#include "FasTC/MatrixBase.h"
 
 static const float kEpsilon = 1e-6f;
 
@@ -221,7 +221,7 @@ TEST(MatrixBase, VectorMultiplication) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "MatrixSquare.h"
+#include "FasTC/MatrixSquare.h"
 
 TEST(MatrixSquare, Constructors) {
   FasTC::MatrixBase<int, 3, 3> m;
@@ -262,7 +262,7 @@ TEST(MatrixSquare, PowerMethod) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Matrix2x2.h"
+#include "FasTC/Matrix2x2.h"
 
 TEST(Matrix2x2, Constructors) {
   FasTC::MatrixBase<int, 2, 2> m;
@@ -292,7 +292,7 @@ TEST(Matrix2x2, Constructors) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Matrix3x3.h"
+#include "FasTC/Matrix3x3.h"
 
 TEST(Matrix3x3, Constructors) {
   FasTC::MatrixBase<int, 3, 3> m;
@@ -323,7 +323,7 @@ TEST(Matrix3x3, Constructors) {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Matrix4x4.h"
+#include "FasTC/Matrix4x4.h"
 
 TEST(Matrix4x4, Constructors) {
   FasTC::MatrixBase<int, 4, 4> m;

Base/test/TestPixel.cpp

@@ -51,7 +51,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "Pixel.h"
+#include "FasTC/Pixel.h"
 
 TEST(Pixel, DefaultConstructor) {
   FasTC::Pixel p;

Base/test/TestVector.cpp

@@ -51,7 +51,7 @@
  */
 
 #include "gtest/gtest.h"
-#include "VectorBase.h"
+#include "FasTC/VectorBase.h"
 
 static const float kEpsilon = 1e-6f;
 
@@ -249,7 +249,7 @@ TEST(VectorBase, Addition) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Vector2.h"
+#include "FasTC/Vector2.h"
 
 TEST(Vector2, BaseFunctionality) {
   FasTC::Vec2f v2f;
@@ -307,7 +307,7 @@ TEST(Vector2, Swizzle) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Vector3.h"
+#include "FasTC/Vector3.h"
 
 TEST(Vector3, BaseFunctionality) {
   FasTC::Vec3f vf;
@@ -393,7 +393,7 @@ TEST(Vector3, CrossProduct) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Vector4.h"
+#include "FasTC/Vector4.h"
 
 TEST(Vector4, BaseFunctionality) {
   FasTC::Vec4f vf;

Base/test/Utils.h

@@ -53,7 +53,7 @@
 #ifndef PVRTCENCODER_TEST_TESTUTILS_H_
 #define PVRTCENCODER_TEST_TESTUTILS_H_
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
 class PixelPrinter {
  private:

CLTool/CMakeLists.txt

@@ -76,5 +76,8 @@ TARGET_LINK_LIBRARIES( tc FasTCCore )
 TARGET_LINK_LIBRARIES( compare FasTCBase )
 TARGET_LINK_LIBRARIES( compare FasTCIO )
 
-TARGET_LINK_LIBRARIES( compare FasTCBase )
+TARGET_LINK_LIBRARIES( decomp FasTCBase )
 TARGET_LINK_LIBRARIES( decomp FasTCIO )
+
+INSTALL(TARGETS tc compare decomp EXPORT FasTCTargets
+  RUNTIME DESTINATION bin COMPONENT bin)

CLTool/src/compare.cpp

@@ -54,10 +54,10 @@
 #  include <Windows.h>
 #endif
 
-#include "Image.h"
-#include "ImageFile.h"
-#include "TexComp.h"
-#include "ThreadSafeStreambuf.h"
+#include "FasTC/Image.h"
+#include "FasTC/ImageFile.h"
+#include "FasTC/TexComp.h"
+#include "FasTC/ThreadSafeStreambuf.h"
 
 int main(int argc, char **argv) {
   if(argc != 3) {

CLTool/src/decomp.cpp

@@ -54,10 +54,10 @@
 #  include <Windows.h>
 #endif
 
-#include "Image.h"
-#include "ImageFile.h"
-#include "TexComp.h"
-#include "ThreadSafeStreambuf.h"
+#include "FasTC/Image.h"
+#include "FasTC/ImageFile.h"
+#include "FasTC/TexComp.h"
+#include "FasTC/ThreadSafeStreambuf.h"
 
 void PrintUsage() {
   fprintf(stderr, "Usage: decomp <in_img> <out_img>\n");

CLTool/src/tc.cpp

@@ -67,10 +67,10 @@
 #  undef max
 #endif
 
-#include "Image.h"
-#include "ImageFile.h"
-#include "TexComp.h"
-#include "ThreadSafeStreambuf.h"
+#include "FasTC/Image.h"
+#include "FasTC/ImageFile.h"
+#include "FasTC/TexComp.h"
+#include "FasTC/ThreadSafeStreambuf.h"
 
 void PrintUsage() {
   fprintf(stderr, "Usage: tc [OPTIONS] imagefile\n");

CMakeLists.txt

@@ -50,7 +50,12 @@
 # <http://gamma.cs.unc.edu/FasTC/>
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
-PROJECT(FasTC)
+PROJECT(FasTC CXX C)
+
+SET(FasTC_MAJOR_VERSION 0)
+SET(FasTC_MINOR_VERSION 0)
+SET(FasTC_PATCH_VERSION 1)
+SET(FasTC_VERSION ${FasTC_MAJOR_VERSION}.${FasTC_MINOR_VERSION}.${FasTC_PATCH_VERSION})
 
 OPTION(TREAT_WARNINGS_AS_ERRORS "Treat compiler warnings as errors. We use the highest warnings levels for compilers." OFF)
 
@@ -104,6 +109,16 @@ SET(CMAKE_MODULE_PATH "${FasTC_SOURCE_DIR}/CMakeModules" ${CMAKE_MODULE_PATH})
 FIND_PACKAGE(PVRTexLib)
 FIND_PACKAGE(BC7Export)
 
+######################################################################
+##
+## Package definitions 
+##
+######################################################################
+
+SET(INCLUDE_INSTALL_DIR include CACHE INTERNAL "")
+SET(LIB_INSTALL_DIR lib CACHE INTERNAL "")
+SET(BIN_INSTALL_DIR bin CACHE INTERNAL "")
+
 SET(FASTC_DIRECTORIES
   Base Core IO BPTCEncoder PVRTCEncoder DXTEncoder ETCEncoder ASTCEncoder
 )
@@ -111,12 +126,56 @@ SET(FASTC_DIRECTORIES
 FOREACH(DIR ${FASTC_DIRECTORIES})
   ADD_SUBDIRECTORY(${DIR})
 ENDFOREACH()
+ADD_SUBDIRECTORY(CLTool)
+
+SET(FasTC_LIBRARIES FasTCBase FasTCIO FasTCCore BPTCEncoder PVRTCEncoder DXTEncoder ETCEncoder ASTCEncoder)
+SET(FasTC_EXECUTABLES tc compare decomp)
+
+######################################################################
+##
+## Config
+##
+######################################################################
+
+INCLUDE(CMakePackageConfigHelpers)
+CONFIGURE_PACKAGE_CONFIG_FILE(
+  "${FasTC_SOURCE_DIR}/CMakeModules/FasTCConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/FasTCConfig.cmake"
+  INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/FasTC
+  PATH_VARS INCLUDE_INSTALL_DIR BIN_INSTALL_DIR LIB_INSTALL_DIR)
+
+WRITE_BASIC_PACKAGE_VERSION_FILE(
+  "${CMAKE_CURRENT_BINARY_DIR}/FasTCConfigVersion.cmake"
+  VERSION ${FasTC_VERSION}
+  COMPATIBILITY SameMajorVersion)
+
+INSTALL(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/FasTCConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/FasTCConfig.cmake"
+  DESTINATION ${LIB_INSTALL_DIR}/cmake/FasTC
+  COMPONENT dev)
+
+EXPORT(
+  TARGETS ${FasTC_LIBRARIES} ${FasTC_EXECUTABLES}
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/FasTCTargets.cmake")
+EXPORT(PACKAGE FasTC)
+
+INSTALL(
+  EXPORT FasTCTargets
+  FILE FasTCTargets.cmake
+  DESTINATION ${LIB_INSTALL_DIR}/cmake/FasTC)
+
+######################################################################
+##
+## Testing
+##
+######################################################################
 
 ENABLE_TESTING()
 
 IF(MSVC)
   SET(gtest_force_shared_crt TRUE)
 ENDIF(MSVC)
+
 ADD_SUBDIRECTORY(GTest)
 FOREACH(DIR ${FASTC_DIRECTORIES})
   SET(TESTDIR ${FasTC_SOURCE_DIR}/${DIR}/test)
@@ -124,5 +183,3 @@ FOREACH(DIR ${FASTC_DIRECTORIES})
     ADD_SUBDIRECTORY(${TESTDIR})
   ENDIF()
 ENDFOREACH()
-
-ADD_SUBDIRECTORY(CLTool)

CMakeModules/FasTCConfig.cmake.in

@@ -0,0 +1,29 @@
+SET(FASTC_VERSION @FasTC_VERSION@)
+
+@PACKAGE_INIT@
+
+SET(FasTC_LIBRARIES FasTCBase FasTCIO FasTCCore BPTCEncoder PVRTCEncoder DXTEncoder ETCEncoder ASTCEncoder)
+
+IF(NOT TARGET FasTCBase)
+  # We're coming from a build tree -- include all of the targets
+  # from the project and try to make sure that our includes are set properly
+  INCLUDE("${CMAKE_CURRENT_LIST_DIR}/FasTCTargets.cmake")
+
+  FOREACH(LIB ${FasTC_LIBRARIES})
+    STRING(REPLACE "FasTC" "" DIR "${LIB}")
+    SET(CURRENT_DIR "${CMAKE_CURRENT_LIST_DIR}/${DIR}/include")
+    IF( EXISTS "${CURRENT_DIR}/" )
+      SET(FasTC_INCLUDE_DIRS ${FasTC_INCLUDE_DIRS} ${CURRENT_DIR})
+    ENDIF()
+  ENDFOREACH()
+
+  SET(FasTC_EXECUTABLES tc compare decomp)
+
+ELSE()
+
+  # This is an install tree -- everything should be a lot easier....
+  SET_AND_CHECK(FasTC_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@/FasTC")
+  SET_AND_CHECK(FasTC_BIN_DIR "@PACKAGE_BIN_INSTALL_DIR@")
+  SET_AND_CHECK(FasTC_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+
+ENDIF()

CMakeModules/FasTCVersion.cmake.in

@@ -0,0 +1,11 @@
+SET(PACKAGE_VERSION "@FasTC_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()

Core/CMakeLists.txt

@@ -49,23 +49,25 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Base/include )
-INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/Base/include )
-
 SET( SOURCES
-	"src/TexComp.cpp"
-	"src/CompressedImage.cpp"
+  "src/TexComp.cpp"
+  "src/CompressedImage.cpp"
+)
+
+SET( LIBRARY_HEADERS
+  "include/FasTC/CompressedImage.h"
+  "include/FasTC/ReferenceCounter.h"
+  "include/FasTC/StopWatch.h"
+  "include/FasTC/TexComp.h"
+  "include/FasTC/ThreadSafeStreambuf.h"
 )
 
 SET( HEADERS
-	"include/TexComp.h"
-	"include/CompressedImage.h"
-    "src/CompressionFuncs.h"
+  ${LIBRARY_HEADERS}
+  "src/CompressionFuncs.h"
 )
 
 # Make sure to add the appropriate stopwatch files...
-SET( HEADERS	${HEADERS} "include/StopWatch.h" )
-
 IF( WIN32 )
 	SET( SOURCES ${SOURCES} "src/StopWatchWin32.cpp" )
 ELSEIF( APPLE )
@@ -77,23 +79,6 @@ ELSE()
 	SET( LINK_FLAGS -lrt ${LINK_FLAGS} )
 ENDIF()
 
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR} )
-
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/ASTCEncoder/include )
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/ETCEncoder/include )
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/DXTEncoder/include )
-
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/PVRTCEncoder/include )
-INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/PVRTCEncoder/include)
-
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/BPTCEncoder/include )
-INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/BPTCEncoder/include )
-
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/IO/include )
-INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/IO/include )
-
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Core/include )
-
 ###### Find Threads....
 IF( MSVC )
 	SET( SOURCES ${SOURCES} "src/ThreadWin32.cpp" )
@@ -106,8 +91,8 @@ ELSE()
 	ENDIF()
 ENDIF()
 
+# Add internal sources
 SET( HEADERS ${HEADERS} "src/Thread.h" )
-SET( HEADERS ${HEADERS} "include/ThreadSafeStreambuf.h" )
 SET( HEADERS ${HEADERS} "src/ThreadGroup.h" )
 SET( HEADERS ${HEADERS} "src/WorkerQueue.h" )
 
@@ -116,11 +101,40 @@ SET( SOURCES ${SOURCES} "src/Thread.cpp" )
 SET( SOURCES ${SOURCES} "src/ThreadGroup.cpp" )
 SET( SOURCES ${SOURCES} "src/WorkerQueue.cpp" )
 
+# Dependencies...
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Base/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/Base/include )
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Core/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/Core/include )
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/IO/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/IO/include )
+
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/ASTCEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/ASTCEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/ETCEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/ETCEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/DXTEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/DXTEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/PVRTCEncoder/include)
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/PVRTCEncoder/include)
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/BPTCEncoder/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/BPTCEncoder/include )
+
 ADD_LIBRARY( FasTCCore
 	${HEADERS}
 	${SOURCES}
 )
 
+INSTALL(
+  TARGETS FasTCCore
+  EXPORT FasTCTargets
+  ARCHIVE DESTINATION lib COMPONENT lib
+)
+
+INSTALL(
+  FILES ${LIBRARY_HEADERS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/FasTC COMPONENT dev)
+
 TARGET_LINK_LIBRARIES( FasTCCore FasTCBase )
 TARGET_LINK_LIBRARIES( FasTCCore FasTCIO )
 TARGET_LINK_LIBRARIES( FasTCCore ETCEncoder )

Core/include/FasTC/CompressedImage.h

@@ -44,9 +44,9 @@
 #ifndef _COMPRESSED_IMAGE_H_
 #define _COMPRESSED_IMAGE_H_
 
-#include "TexCompTypes.h"
-#include "CompressionFormat.h"
-#include "Image.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/CompressionFormat.h"
+#include "FasTC/Image.h"
 
 class CompressedImage : public FasTC::Image<FasTC::Pixel> {
  private:

Core/include/FasTC/TexComp.h

@@ -44,11 +44,11 @@
 #ifndef _TEX_COMP_H_
 #define _TEX_COMP_H_
 
-#include "CompressedImage.h"
-#include "CompressionJob.h"
+#include "FasTC/CompressedImage.h"
+#include "FasTC/CompressionJob.h"
 
 #include <iosfwd>
-#include "ImageFwd.h"
+#include "FasTC/ImageFwd.h"
 
 // Forward declarations
 class ImageFile;

Core/src/CompressedImage.cpp

@@ -50,21 +50,21 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "CompressedImage.h"
+#include "FasTC/CompressedImage.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
-#include "Pixel.h"
+#include "FasTC/Pixel.h"
 
-#include "TexCompTypes.h"
-#include "BPTCCompressor.h"
-#include "PVRTCCompressor.h"
-#include "DXTCompressor.h"
-#include "ETCCompressor.h"
-#include "ASTCCompressor.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/BPTCCompressor.h"
+#include "FasTC/PVRTCCompressor.h"
+#include "FasTC/DXTCompressor.h"
+#include "FasTC/ETCCompressor.h"
+#include "FasTC/ASTCCompressor.h"
 
 using FasTC::CompressionJob;
 using FasTC::DecompressionJob;

Core/src/CompressionFuncs.h

@@ -53,7 +53,7 @@
 #ifndef CORE_SRC_COMPRESSIONFUNCS_H_
 #define CORE_SRC_COMPRESSIONFUNCS_H_
 
-#include "CompressionJob.h"
+#include "FasTC/CompressionJob.h"
 #include <iosfwd>
 
 // A compression function format. It takes the raw data and image dimensions and 

Core/src/StopWatchOSX.cpp

@@ -41,8 +41,8 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "StopWatch.h"
-#include "TexCompTypes.h"
+#include "FasTC/StopWatch.h"
+#include "FasTC/TexCompTypes.h"
 
 #include <stdlib.h>
 #include <string.h>

Core/src/StopWatchUnix.cpp

@@ -41,8 +41,8 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "StopWatch.h"
-#include "TexCompTypes.h"
+#include "FasTC/StopWatch.h"
+#include "FasTC/TexCompTypes.h"
 
 #include <stdlib.h>
 #include <string.h>

Core/src/StopWatchWin32.cpp

@@ -63,8 +63,8 @@
 //
 //--------------------------------------------------------------------------------------
 
-#include "StopWatch.h"
-#include "TexCompTypes.h"
+#include "FasTC/StopWatch.h"
+#include "FasTC/TexCompTypes.h"
 
 #include <cassert>
 #include <Windows.h>

Core/src/TexComp.cpp

@@ -41,7 +41,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "TexComp.h"
+#include "FasTC/TexComp.h"
 
 #include <algorithm>
 #include <cmath>
@@ -50,14 +50,15 @@
 #include <iostream>
 #include <string.h>
 
-#include "BPTCCompressor.h"
-#include "CompressionFormat.h"
+#include "FasTC/BPTCCompressor.h"
+#include "FasTC/CompressionFormat.h"
+#include "FasTC/DXTCompressor.h"
+#include "FasTC/ETCCompressor.h"
+#include "FasTC/ImageFile.h"
+#include "FasTC/Pixel.h"
+#include "FasTC/PVRTCCompressor.h"
+
 #include "CompressionFuncs.h"
-#include "DXTCompressor.h"
-#include "ETCCompressor.h"
-#include "ImageFile.h"
-#include "Pixel.h"
-#include "PVRTCCompressor.h"
 #include "Thread.h"
 #include "ThreadGroup.h"
 #include "WorkerQueue.h"

Core/src/Thread.h

@@ -44,7 +44,7 @@
 #ifndef __TEX_COMP_THREAD_H__
 #define __TEX_COMP_THREAD_H__
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
 //!HACK! Apparently MSVC has issues with Yield()...????
 #ifdef _MSC_VER

Core/src/ThreadGroup.cpp

@@ -42,7 +42,7 @@
  */
 
 #include "ThreadGroup.h"
-#include "BPTCCompressor.h"
+#include "FasTC/BPTCCompressor.h"
 
 #include <cstdlib>
 #include <cstdio>

Core/src/ThreadGroup.h

@@ -44,9 +44,10 @@
 #ifndef _THREAD_GROUP_H_
 #define _THREAD_GROUP_H_
 
+#include "FasTC/StopWatch.h"
+
 #include "CompressionFuncs.h"
 #include "Thread.h"
-#include "StopWatch.h"
 
 #include <iosfwd>
 

Core/src/ThreadSafeStreambuf.cpp

@@ -50,7 +50,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "ThreadSafeStreambuf.h"
+#include "FasTC/ThreadSafeStreambuf.h"
 
 #include <cstdlib>
 #include <cstdio>

Core/src/WorkerQueue.cpp

@@ -49,7 +49,7 @@
 #include <cassert>
 #include <iostream>
 
-#include "BPTCCompressor.h"
+#include "FasTC/BPTCCompressor.h"
 
 using FasTC::CompressionJob;
 

Core/src/WorkerQueue.h

@@ -48,9 +48,10 @@
 class WorkerQueue;
 
 // Necessary includes...
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/StopWatch.h"
+
 #include "Thread.h"
-#include "StopWatch.h"
 #include "CompressionFuncs.h"
 
 #include <iosfwd>

DXTEncoder/CMakeLists.txt

@@ -40,24 +40,29 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
-INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
-
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/DXTEncoder/include)
-INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/DXTEncoder/include)
-
-SET( HEADERS
-  include/DXTCompressor.h
+SET( LIBRARY_HEADERS
+  "include/FasTC/DXTCompressor.h"
 )
 
 SET( SOURCES
-  src/DXTCompressor.cpp
-  src/DXTDecompressor.cpp
+  "src/Compressor.cpp"
+  "src/Decompressor.cpp"
 )
 
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
+INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/DXTEncoder/include)
+INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/DXTEncoder/include)
+
 ADD_LIBRARY( DXTEncoder
   ${HEADERS}
   ${SOURCES}
 )
 
+INSTALL(TARGETS DXTEncoder EXPORT FasTCTargets ARCHIVE DESTINATION lib COMPONENT lib)
+INSTALL(
+  FILES ${LIBRARY_HEADERS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/FasTC
+  COMPONENT dev)
+
 TARGET_LINK_LIBRARIES( DXTEncoder FasTCBase )

DXTEncoder/include/FasTC/DXTCompressor.h

@@ -10,8 +10,8 @@
 	Lesser General Public License for more details.
 */
 
-#include "TexCompTypes.h"
-#include "CompressionJob.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/CompressionJob.h"
 
 namespace DXTC
 {

DXTEncoder/src/Compressor.cpp

@@ -13,7 +13,7 @@
 // Refer to "Real-Time DXT Compression" by J.M.P. van Waveren for a more thorough discussion of the
 // algorithms used in this code.
 
-#include "DXTCompressor.h"
+#include "FasTC/DXTCompressor.h"
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>

DXTEncoder/src/Decompressor.cpp

@@ -50,12 +50,13 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "DXTCompressor.h"
+#include "FasTC/DXTCompressor.h"
+
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
 
-#include "Pixel.h"
+#include "FasTC/Pixel.h"
 
 namespace DXTC
 {

ETCEncoder/CMakeLists.txt

@@ -40,14 +40,12 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
-INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
-
-INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/ETCEncoder/include)
-INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/ETCEncoder/include)
+SET( LIBRARY_HEADERS
+  "include/FasTC/ETCCompressor.h"
+)
 
 SET( HEADERS
-  include/ETCCompressor.h
+  ${LIBRARY_HEADERS}
   src/rg_etc1.h
 )
 
@@ -57,9 +55,20 @@ SET( SOURCES
   src/rg_etc1.cpp
 )
 
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/Base/include)
+INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/Base/include)
+INCLUDE_DIRECTORIES(${FasTC_SOURCE_DIR}/ETCEncoder/include)
+INCLUDE_DIRECTORIES(${FasTC_BINARY_DIR}/ETCEncoder/include)
+
 ADD_LIBRARY( ETCEncoder
   ${HEADERS}
   ${SOURCES}
 )
 
+INSTALL(TARGETS ETCEncoder EXPORT FasTCTargets ARCHIVE DESTINATION lib COMPONENT lib)
+INSTALL(
+  FILES ${LIBRARY_HEADERS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/FasTC
+  COMPONENT dev)
+
 TARGET_LINK_LIBRARIES( ETCEncoder FasTCBase )

ETCEncoder/include/FasTC/ETCCompressor.h

@@ -53,8 +53,8 @@
 #ifndef ETCENCODER_INCLUDE_ETCCOMPRESSOR_H_
 #define ETCENCODER_INCLUDE_ETCCOMPRESSOR_H_
 
-#include "CompressionJob.h"
-#include "TexCompTypes.h"
+#include "FasTC/CompressionJob.h"
+#include "FasTC/TexCompTypes.h"
 
 namespace ETCC {
 

ETCEncoder/src/Compressor.cpp

@@ -50,8 +50,9 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
+#include "FasTC/ETCCompressor.h"
+
 #include "rg_etc1.h"
-#include "ETCCompressor.h"
 #include <algorithm>
 #include <cstring>
 

ETCEncoder/src/Decompressor.cpp

@@ -50,8 +50,9 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
+#include "FasTC/ETCCompressor.h"
+
 #include "rg_etc1.h"
-#include "ETCCompressor.h"
 
 namespace ETCC {
 

IO/CMakeLists.txt

@@ -40,23 +40,22 @@
 # 
 # <http://gamma.cs.unc.edu/FasTC/>
 
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Base/include )
-INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/Base/include)
-
-INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/IO/include )
-INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/IO/include )
-
 SET( SOURCES
 	"src/ImageWriter.cpp"
 	"src/ImageLoader.cpp"
 	"src/ImageFile.cpp"
 )
 
+SET( LIBRARY_HEADERS
+	"include/FasTC/ImageFile.h"
+	"include/FasTC/ImageFileFormat.h"
+	"include/FasTC/FileStream.h"
+)
+
 SET( HEADERS
 	"config/ImageWriter.h.in"
 	"config/ImageLoader.h.in"
-	"include/ImageFile.h"
-	"include/FileStream.h"
+    ${LIBRARY_HEADERS}
 )
 
 IF( WIN32 )
@@ -111,20 +110,32 @@ ENDIF(OPENGL_FOUND)
 
 CONFIGURE_FILE(
 	"config/ImageLoader.h.in"
-	"include/ImageLoader.h"
+	"include/FasTC/ImageLoader.h"
 )
 
 CONFIGURE_FILE(
 	"config/ImageWriter.h.in"
-	"include/ImageWriter.h"
+	"include/FasTC/ImageWriter.h"
 )
 
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Base/include)
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/Base/include)
 INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/Core/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/Core/include )
+INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/IO/include )
+INCLUDE_DIRECTORIES( ${FasTC_BINARY_DIR}/IO/include )
 
-ADD_LIBRARY(FasTCIO
-	${SOURCES}
-	${HEADERS}
+ADD_LIBRARY(FasTCIO ${SOURCES} ${HEADERS})
+
+INSTALL(TARGETS FasTCIO EXPORT FasTCTargets ARCHIVE DESTINATION lib COMPONENT lib)
+SET(EXPORT_HEADERS
+  ${LIBRARY_HEADERS}
+  "${FasTC_BINARY_DIR}/IO/include/FasTC/ImageWriter.h"
+  "${FasTC_BINARY_DIR}/IO/include/FasTC/ImageLoader.h"
 )
+INSTALL(
+  FILES ${EXPORT_HEADERS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/FasTC COMPONENT dev)
 
 TARGET_LINK_LIBRARIES( FasTCIO FasTCBase )
 TARGET_LINK_LIBRARIES( FasTCIO FasTCCore )

IO/config/ImageLoader.h.in

@@ -44,9 +44,9 @@
 #ifndef _IMAGE_LOADER_H_
 #define _IMAGE_LOADER_H_
 
-#include "ImageFileFormat.h"
-#include "TexCompTypes.h"
-#include "ImageFwd.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/ImageFwd.h"
+#include "FasTC/ImageFileFormat.h"
 
 class ImageLoader {
 

IO/config/ImageWriter.h.in

@@ -44,8 +44,8 @@
 #ifndef _IMAGE_WRITER_H_
 #define _IMAGE_WRITER_H_
 
-#include "ImageFileFormat.h"
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/ImageFileFormat.h"
 
 namespace FasTC {
   class Pixel;

IO/include/FasTC/FileStream.h

@@ -44,7 +44,7 @@
 #ifndef __FILE_STREAM_H__
 #define __FILE_STREAM_H__
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
 enum EFileMode {
   eFileMode_Read,

IO/include/FasTC/ImageFile.h

@@ -44,9 +44,10 @@
 #ifndef _IMAGE_FILE_H_ 
 #define _IMAGE_FILE_H_ 
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/ImageFwd.h"
+
 #include "ImageFileFormat.h"
-#include "ImageFwd.h"
 
 // Forward declare
 class CompressedImage;

IO/src/FileStreamUnix.cpp

@@ -41,7 +41,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "FileStream.h"
+#include "FasTC/FileStream.h"
 
 #include <stdio.h>
 #include <stdlib.h>

IO/src/FileStreamWin32.cpp

@@ -50,7 +50,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "FileStream.h"
+#include "FasTC/FileStream.h"
 
 #define _CRT_SECURE_NO_WARNINGS
 #define WIN32_LEAN_AND_MEAN

IO/src/ImageFile.cpp

@@ -41,7 +41,7 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "ImageFile.h"
+#include "FasTC/ImageFile.h"
 
 #include <cstring>
 #include <cstdlib>
@@ -50,11 +50,11 @@
 #include <cassert>
 #include <algorithm>
 
-#include "ImageWriter.h"
-#include "ImageLoader.h"
-#include "CompressedImage.h"
-#include "Image.h"
-#include "FileStream.h"
+#include "FasTC/ImageWriter.h"
+#include "FasTC/ImageLoader.h"
+#include "FasTC/CompressedImage.h"
+#include "FasTC/Image.h"
+#include "FasTC/FileStream.h"
 
 #ifdef PNG_FOUND
 #  include "ImageLoaderPNG.h"

IO/src/ImageLoader.cpp

@@ -41,14 +41,14 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "ImageLoader.h"
+#include "FasTC/ImageLoader.h"
+#include "FasTC/Image.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
 #include <assert.h>
 
-#include "Image.h"
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Static helper functions

IO/src/ImageLoaderASTC.cpp

@@ -58,13 +58,13 @@
 #include <cstring>
 #include <iostream>
 
-#include "TexCompTypes.h"
-#include "CompressionFormat.h"
-#include "ScopedAllocator.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/Image.h"
+#include "FasTC/CompressionFormat.h"
+#include "FasTC/ScopedAllocator.h"
 
 #include "GLDefines.h"
-#include "Image.h"
-#include "CompressedImage.h"
+#include "FasTC/CompressedImage.h"
 
 static bool GetFormatForBlockDimensions(FasTC::ECompressionFormat &out,
                                         uint32 blockWidth, uint32 blockHeight) {

IO/src/ImageLoaderASTC.h

@@ -53,7 +53,7 @@
 #ifndef _IO_SRC_IMAGE_LOADER_ASTC_H_
 #define _IO_SRC_IMAGE_LOADER_ASTC_H_
 
-#include "ImageLoader.h"
+#include "FasTC/ImageLoader.h"
 
 class ImageLoaderASTC : public ImageLoader {
  private:

IO/src/ImageLoaderKTX.cpp

@@ -58,12 +58,12 @@
 #include <cstring>
 #include <iostream>
 
-#include "TexCompTypes.h"
-#include "ScopedAllocator.h"
+#include "FasTC/Image.h"
+#include "FasTC/TexCompTypes.h"
+#include "FasTC/CompressedImage.h"
+#include "FasTC/ScopedAllocator.h"
 
 #include "GLDefines.h"
-#include "Image.h"
-#include "CompressedImage.h"
 
 class ByteReader {
  private:

IO/src/ImageLoaderKTX.h

@@ -53,8 +53,8 @@
 #ifndef _IO_SRC_IMAGE_LOADER_KTX_H_
 #define _IO_SRC_IMAGE_LOADER_KTX_H_
 
-#include "ImageLoader.h"
-#include "CompressionFormat.h"
+#include "FasTC/ImageLoader.h"
+#include "FasTC/CompressionFormat.h"
 
 class ImageLoaderKTX : public ImageLoader {
  public:

IO/src/ImageLoaderPNG.h

@@ -44,7 +44,7 @@
 #ifndef _IMAGE_LOADER_PNG_H_
 #define _IMAGE_LOADER_PNG_H_
 
-#include "ImageLoader.h"
+#include "FasTC/ImageLoader.h"
 
 class ImageLoaderPNG : public ImageLoader {
  public:

IO/src/ImageLoaderPVR.cpp

@@ -48,7 +48,7 @@
 #include <algorithm>
 #include <iostream>
 
-#include "TexCompTypes.h"
+#include "FasTC/TexCompTypes.h"
 
 #include "PVRTextureUtilities.h"
 

IO/src/ImageLoaderPVR.h

@@ -44,7 +44,7 @@
 #ifndef _IMAGE_LOADER_PVR_H_
 #define _IMAGE_LOADER_PVR_H_
 
-#include "ImageLoader.h"
+#include "FasTC/ImageLoader.h"
 
 class ImageLoaderPVR : public ImageLoader {
  public: