fixed indentation to follow nvtt guidelines
This commit is contained in:
magestik
parent
5f392e60e3
commit
e6f76afdc5
|
|
@ -1,25 +1,25 @@
|
||||||
PROJECT(nvcore)
|
PROJECT(nvcore)
|
||||||
|
|
||||||
SET(CORE_SRCS
|
SET(CORE_SRCS
|
||||||
nvcore.h
|
nvcore.h
|
||||||
Array.h
|
Array.h
|
||||||
Debug.h Debug.cpp
|
Debug.h Debug.cpp
|
||||||
DefsGnucDarwin.h
|
DefsGnucDarwin.h
|
||||||
DefsGnucLinux.h
|
DefsGnucLinux.h
|
||||||
DefsGnucWin32.h
|
DefsGnucWin32.h
|
||||||
DefsVcWin32.h
|
DefsVcWin32.h
|
||||||
FileSystem.h FileSystem.cpp
|
FileSystem.h FileSystem.cpp
|
||||||
ForEach.h
|
ForEach.h
|
||||||
Library.h Library.cpp
|
Library.h Library.cpp
|
||||||
Memory.h Memory.cpp
|
Memory.h Memory.cpp
|
||||||
Ptr.h
|
Ptr.h
|
||||||
RefCounted.h
|
RefCounted.h
|
||||||
StrLib.h StrLib.cpp
|
StrLib.h StrLib.cpp
|
||||||
Stream.h
|
Stream.h
|
||||||
StdStream.h
|
StdStream.h
|
||||||
TextWriter.h TextWriter.cpp
|
TextWriter.h TextWriter.cpp
|
||||||
Timer.h Timer.cpp
|
Timer.h Timer.cpp
|
||||||
Utils.h)
|
Utils.h)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|
||||||
|
|
@ -27,21 +27,21 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
ADD_DEFINITIONS(-DNVCORE_EXPORTS)
|
ADD_DEFINITIONS(-DNVCORE_EXPORTS)
|
||||||
|
|
||||||
IF(UNIX)
|
IF(UNIX)
|
||||||
SET(LIBS ${LIBS} ${CMAKE_DL_LIBS})
|
SET(LIBS ${LIBS} ${CMAKE_DL_LIBS})
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
IF(NVCORE_SHARED)
|
IF(NVCORE_SHARED)
|
||||||
ADD_DEFINITIONS(-DNVCORE_SHARED=1)
|
ADD_DEFINITIONS(-DNVCORE_SHARED=1)
|
||||||
ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
|
ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
|
||||||
ELSE(NVCORE_SHARED)
|
ELSE(NVCORE_SHARED)
|
||||||
ADD_LIBRARY(nvcore ${CORE_SRCS})
|
ADD_LIBRARY(nvcore ${CORE_SRCS})
|
||||||
ENDIF(NVCORE_SHARED)
|
ENDIF(NVCORE_SHARED)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nvcore ${LIBS})
|
TARGET_LINK_LIBRARIES(nvcore ${LIBS})
|
||||||
|
|
||||||
INSTALL(TARGETS nvcore EXPORT nvcore-targets
|
INSTALL(TARGETS nvcore EXPORT nvcore-targets
|
||||||
RUNTIME DESTINATION bin
|
RUNTIME DESTINATION bin
|
||||||
LIBRARY DESTINATION lib
|
LIBRARY DESTINATION lib
|
||||||
ARCHIVE DESTINATION lib/static)
|
ARCHIVE DESTINATION lib/static)
|
||||||
INSTALL(EXPORT nvcore-targets DESTINATION share/cmake)
|
INSTALL(EXPORT nvcore-targets DESTINATION share/cmake)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,63 +1,63 @@
|
||||||
PROJECT(nvimage)
|
PROJECT(nvimage)
|
||||||
|
|
||||||
SET(IMAGE_SRCS
|
SET(IMAGE_SRCS
|
||||||
nvimage.h
|
nvimage.h
|
||||||
BlockDXT.h BlockDXT.cpp
|
BlockDXT.h BlockDXT.cpp
|
||||||
ColorBlock.h ColorBlock.cpp
|
ColorBlock.h ColorBlock.cpp
|
||||||
DirectDrawSurface.h DirectDrawSurface.cpp
|
DirectDrawSurface.h DirectDrawSurface.cpp
|
||||||
ErrorMetric.h ErrorMetric.cpp
|
ErrorMetric.h ErrorMetric.cpp
|
||||||
Filter.h Filter.cpp
|
Filter.h Filter.cpp
|
||||||
FloatImage.h FloatImage.cpp
|
FloatImage.h FloatImage.cpp
|
||||||
Image.h Image.cpp
|
Image.h Image.cpp
|
||||||
ImageIO.h ImageIO.cpp
|
ImageIO.h ImageIO.cpp
|
||||||
#KtxFile.h KtxFile.cpp
|
#KtxFile.h KtxFile.cpp
|
||||||
NormalMap.h NormalMap.cpp
|
NormalMap.h NormalMap.cpp
|
||||||
PixelFormat.h
|
PixelFormat.h
|
||||||
PsdFile.h
|
PsdFile.h
|
||||||
TgaFile.h)
|
TgaFile.h)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|
||||||
IF(PNG_FOUND)
|
IF(PNG_FOUND)
|
||||||
SET(LIBS ${LIBS} ${PNG_LIBRARIES})
|
SET(LIBS ${LIBS} ${PNG_LIBRARIES})
|
||||||
INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
|
||||||
ENDIF(PNG_FOUND)
|
ENDIF(PNG_FOUND)
|
||||||
|
|
||||||
IF(JPEG_FOUND)
|
IF(JPEG_FOUND)
|
||||||
SET(LIBS ${LIBS} ${JPEG_LIBRARIES})
|
SET(LIBS ${LIBS} ${JPEG_LIBRARIES})
|
||||||
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
|
||||||
ENDIF(JPEG_FOUND)
|
ENDIF(JPEG_FOUND)
|
||||||
|
|
||||||
IF(TIFF_FOUND)
|
IF(TIFF_FOUND)
|
||||||
SET(LIBS ${LIBS} ${TIFF_LIBRARIES})
|
SET(LIBS ${LIBS} ${TIFF_LIBRARIES})
|
||||||
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
|
||||||
ENDIF(TIFF_FOUND)
|
ENDIF(TIFF_FOUND)
|
||||||
|
|
||||||
IF(OPENEXR_FOUND)
|
IF(OPENEXR_FOUND)
|
||||||
SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES})
|
SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES})
|
||||||
INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS})
|
INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS})
|
||||||
ENDIF(OPENEXR_FOUND)
|
ENDIF(OPENEXR_FOUND)
|
||||||
|
|
||||||
IF(FREEIMAGE_FOUND)
|
IF(FREEIMAGE_FOUND)
|
||||||
SET(LIBS ${LIBS} ${FREEIMAGE_LIBRARIES})
|
SET(LIBS ${LIBS} ${FREEIMAGE_LIBRARIES})
|
||||||
INCLUDE_DIRECTORIES(${FREEIMAGE_INCLUDE_PATH})
|
INCLUDE_DIRECTORIES(${FREEIMAGE_INCLUDE_PATH})
|
||||||
ENDIF(FREEIMAGE_FOUND)
|
ENDIF(FREEIMAGE_FOUND)
|
||||||
|
|
||||||
# targets
|
# targets
|
||||||
ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
|
ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
|
||||||
|
|
||||||
IF(NVIMAGE_SHARED)
|
IF(NVIMAGE_SHARED)
|
||||||
ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
|
ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
|
||||||
ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS} $<TARGET_OBJECTS:posh> $<TARGET_OBJECTS:bc6h> $<TARGET_OBJECTS:bc7>)
|
ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS} $<TARGET_OBJECTS:posh> $<TARGET_OBJECTS:bc6h> $<TARGET_OBJECTS:bc7>)
|
||||||
ELSE(NVIMAGE_SHARED)
|
ELSE(NVIMAGE_SHARED)
|
||||||
ADD_LIBRARY(nvimage ${IMAGE_SRCS} $<TARGET_OBJECTS:posh> $<TARGET_OBJECTS:bc6h> $<TARGET_OBJECTS:bc7>)
|
ADD_LIBRARY(nvimage ${IMAGE_SRCS} $<TARGET_OBJECTS:posh> $<TARGET_OBJECTS:bc6h> $<TARGET_OBJECTS:bc7>)
|
||||||
ENDIF(NVIMAGE_SHARED)
|
ENDIF(NVIMAGE_SHARED)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath)
|
TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath)
|
||||||
|
|
||||||
INSTALL(TARGETS nvimage EXPORT nvimage-targets
|
INSTALL(TARGETS nvimage EXPORT nvimage-targets
|
||||||
RUNTIME DESTINATION bin
|
RUNTIME DESTINATION bin
|
||||||
LIBRARY DESTINATION lib
|
LIBRARY DESTINATION lib
|
||||||
ARCHIVE DESTINATION lib/static)
|
ARCHIVE DESTINATION lib/static)
|
||||||
INSTALL(EXPORT nvimage-targets DESTINATION share/cmake)
|
INSTALL(EXPORT nvimage-targets DESTINATION share/cmake)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,16 @@
|
||||||
PROJECT(nvmath)
|
PROJECT(nvmath)
|
||||||
|
|
||||||
SET(MATH_SRCS
|
SET(MATH_SRCS
|
||||||
nvmath.h
|
nvmath.h
|
||||||
Box.h Box.inl
|
Box.h Box.inl
|
||||||
Color.h Color.inl
|
Color.h Color.inl
|
||||||
Fitting.h Fitting.cpp
|
Fitting.h Fitting.cpp
|
||||||
Half.h Half.cpp
|
Half.h Half.cpp
|
||||||
Matrix.h
|
Matrix.h
|
||||||
Plane.h Plane.inl Plane.cpp
|
Plane.h Plane.inl Plane.cpp
|
||||||
SphericalHarmonic.h SphericalHarmonic.cpp
|
SphericalHarmonic.h SphericalHarmonic.cpp
|
||||||
SimdVector.h SimdVector_SSE.h SimdVector_VE.h
|
SimdVector.h SimdVector_SSE.h SimdVector_VE.h
|
||||||
Vector.h Vector.inl)
|
Vector.h Vector.inl)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|
||||||
|
|
@ -18,10 +18,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
ADD_DEFINITIONS(-DNVMATH_EXPORTS)
|
ADD_DEFINITIONS(-DNVMATH_EXPORTS)
|
||||||
|
|
||||||
IF(NVMATH_SHARED)
|
IF(NVMATH_SHARED)
|
||||||
ADD_DEFINITIONS(-DNVMATH_SHARED=1)
|
ADD_DEFINITIONS(-DNVMATH_SHARED=1)
|
||||||
ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
|
ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
|
||||||
ELSE(NVMATH_SHARED)
|
ELSE(NVMATH_SHARED)
|
||||||
ADD_LIBRARY(nvmath ${MATH_SRCS})
|
ADD_LIBRARY(nvmath ${MATH_SRCS})
|
||||||
ENDIF(NVMATH_SHARED)
|
ENDIF(NVMATH_SHARED)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
|
TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
|
||||||
|
|
|
||||||
|
|
@ -3,38 +3,38 @@ PROJECT(nvtt)
|
||||||
ADD_SUBDIRECTORY(squish)
|
ADD_SUBDIRECTORY(squish)
|
||||||
|
|
||||||
SET(NVTT_SRCS
|
SET(NVTT_SRCS
|
||||||
nvtt.h nvtt.cpp
|
nvtt.h nvtt.cpp
|
||||||
nvtt_wrapper.h nvtt_wrapper.cpp
|
nvtt_wrapper.h nvtt_wrapper.cpp
|
||||||
ClusterFit.h ClusterFit.cpp
|
ClusterFit.h ClusterFit.cpp
|
||||||
Compressor.h
|
Compressor.h
|
||||||
BlockCompressor.h BlockCompressor.cpp
|
BlockCompressor.h BlockCompressor.cpp
|
||||||
CompressorDX9.h CompressorDX9.cpp
|
CompressorDX9.h CompressorDX9.cpp
|
||||||
CompressorDX10.h CompressorDX10.cpp
|
CompressorDX10.h CompressorDX10.cpp
|
||||||
CompressorDX11.h CompressorDX11.cpp
|
CompressorDX11.h CompressorDX11.cpp
|
||||||
CompressorDXT1.h CompressorDXT1.cpp
|
CompressorDXT1.h CompressorDXT1.cpp
|
||||||
CompressorDXT5_RGBM.h CompressorDXT5_RGBM.cpp
|
CompressorDXT5_RGBM.h CompressorDXT5_RGBM.cpp
|
||||||
CompressorRGB.h CompressorRGB.cpp
|
CompressorRGB.h CompressorRGB.cpp
|
||||||
Context.h Context.cpp
|
Context.h Context.cpp
|
||||||
QuickCompressDXT.h QuickCompressDXT.cpp
|
QuickCompressDXT.h QuickCompressDXT.cpp
|
||||||
OptimalCompressDXT.h OptimalCompressDXT.cpp
|
OptimalCompressDXT.h OptimalCompressDXT.cpp
|
||||||
SingleColorLookup.h SingleColorLookup.cpp
|
SingleColorLookup.h SingleColorLookup.cpp
|
||||||
CompressionOptions.h CompressionOptions.cpp
|
CompressionOptions.h CompressionOptions.cpp
|
||||||
InputOptions.h InputOptions.cpp
|
InputOptions.h InputOptions.cpp
|
||||||
OutputOptions.h OutputOptions.cpp
|
OutputOptions.h OutputOptions.cpp
|
||||||
TaskDispatcher.h #TaskDispatcher.cpp
|
TaskDispatcher.h #TaskDispatcher.cpp
|
||||||
Surface.h Surface.cpp
|
Surface.h Surface.cpp
|
||||||
CubeSurface.h CubeSurface.cpp
|
CubeSurface.h CubeSurface.cpp
|
||||||
cuda/CudaUtils.h cuda/CudaUtils.cpp
|
cuda/CudaUtils.h cuda/CudaUtils.cpp
|
||||||
cuda/CudaMath.h
|
cuda/CudaMath.h
|
||||||
cuda/BitmapTable.h
|
cuda/BitmapTable.h
|
||||||
cuda/CudaCompressorDXT.h cuda/CudaCompressorDXT.cpp)
|
cuda/CudaCompressorDXT.h cuda/CudaCompressorDXT.cpp)
|
||||||
|
|
||||||
IF (CUDA_FOUND)
|
IF (CUDA_FOUND)
|
||||||
ADD_DEFINITIONS(-DHAVE_CUDA)
|
ADD_DEFINITIONS(-DHAVE_CUDA)
|
||||||
CUDA_COMPILE(CUDA_SRCS cuda/CompressKernel.cu)
|
CUDA_COMPILE(CUDA_SRCS cuda/CompressKernel.cu)
|
||||||
SET(NVTT_SRCS ${NVTT_SRCS} ${CUDA_SRCS})
|
SET(NVTT_SRCS ${NVTT_SRCS} ${CUDA_SRCS})
|
||||||
SET(LIBS ${LIBS} ${CUDA_LIBRARIES})
|
SET(LIBS ${LIBS} ${CUDA_LIBRARIES})
|
||||||
INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})
|
INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})
|
||||||
ENDIF (CUDA_FOUND)
|
ENDIF (CUDA_FOUND)
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|
@ -42,9 +42,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
ADD_DEFINITIONS(-DNVTT_EXPORTS)
|
ADD_DEFINITIONS(-DNVTT_EXPORTS)
|
||||||
|
|
||||||
IF(NVTT_SHARED)
|
IF(NVTT_SHARED)
|
||||||
ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS} $<TARGET_OBJECTS:squish>)
|
ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS} $<TARGET_OBJECTS:squish>)
|
||||||
ELSE(NVTT_SHARED)
|
ELSE(NVTT_SHARED)
|
||||||
ADD_LIBRARY(nvtt ${NVTT_SRCS} $<TARGET_OBJECTS:squish>)
|
ADD_LIBRARY(nvtt ${NVTT_SRCS} $<TARGET_OBJECTS:squish>)
|
||||||
ENDIF(NVTT_SHARED)
|
ENDIF(NVTT_SHARED)
|
||||||
|
|
||||||
TARGET_COMPILE_OPTIONS(nvtt PUBLIC ${OpenMP_CXX_FLAGS})
|
TARGET_COMPILE_OPTIONS(nvtt PUBLIC ${OpenMP_CXX_FLAGS})
|
||||||
|
|
@ -52,9 +52,9 @@ TARGET_COMPILE_OPTIONS(nvtt PUBLIC ${OpenMP_CXX_FLAGS})
|
||||||
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvmath)
|
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvmath)
|
||||||
|
|
||||||
INSTALL(TARGETS nvtt EXPORT nvtt-targets
|
INSTALL(TARGETS nvtt EXPORT nvtt-targets
|
||||||
RUNTIME DESTINATION bin
|
RUNTIME DESTINATION bin
|
||||||
LIBRARY DESTINATION lib
|
LIBRARY DESTINATION lib
|
||||||
ARCHIVE DESTINATION lib/static)
|
ARCHIVE DESTINATION lib/static)
|
||||||
INSTALL(EXPORT nvtt-targets DESTINATION share/cmake)
|
INSTALL(EXPORT nvtt-targets DESTINATION share/cmake)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user