From 97723db79420918710a437948b2e9f8819139199 Mon Sep 17 00:00:00 2001
From: Ignacio <castano@gmail.com>
Date: Mon, 23 Mar 2020 10:02:07 -0700
Subject: [PATCH] Rename internal squish library to nvsquish to avoid
 conflicts.

---
 src/nvtt/CMakeLists.txt        | 2 +-
 src/nvtt/squish/CMakeLists.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt
index 96e0aeb..0e697e6 100644
--- a/src/nvtt/CMakeLists.txt
+++ b/src/nvtt/CMakeLists.txt
@@ -49,7 +49,7 @@ ELSE(NVTT_SHARED)
     ADD_LIBRARY(nvtt ${NVTT_SRCS})
 ENDIF(NVTT_SHARED)
 
-TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread squish bc6h bc7 nvmath rg_etc1)
+TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvsquish bc6h bc7 nvmath rg_etc1)
 
 INSTALL(TARGETS nvtt 
     RUNTIME DESTINATION bin
diff --git a/src/nvtt/squish/CMakeLists.txt b/src/nvtt/squish/CMakeLists.txt
index f7b0ad7..65a5dd3 100644
--- a/src/nvtt/squish/CMakeLists.txt
+++ b/src/nvtt/squish/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(squish)
+PROJECT(nvsquish)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -20,4 +20,4 @@ SET(SQUISH_SRCS
 	simd_sse.h
 	simd_ve.h)
 
-ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
+ADD_LIBRARY(nvsquish STATIC ${SQUISH_SRCS})