diff --git a/src/nvcore/CMakeLists.txt b/src/nvcore/CMakeLists.txt index d8fcf1f..cf42573 100644 --- a/src/nvcore/CMakeLists.txt +++ b/src/nvcore/CMakeLists.txt @@ -1,25 +1,25 @@ PROJECT(nvcore) SET(CORE_SRCS - nvcore.h - Array.h - Debug.h Debug.cpp - DefsGnucDarwin.h - DefsGnucLinux.h - DefsGnucWin32.h - DefsVcWin32.h - FileSystem.h FileSystem.cpp - ForEach.h - Library.h Library.cpp - Memory.h Memory.cpp - Ptr.h - RefCounted.h - StrLib.h StrLib.cpp - Stream.h - StdStream.h - TextWriter.h TextWriter.cpp - Timer.h Timer.cpp - Utils.h) + nvcore.h + Array.h + Debug.h Debug.cpp + DefsGnucDarwin.h + DefsGnucLinux.h + DefsGnucWin32.h + DefsVcWin32.h + FileSystem.h FileSystem.cpp + ForEach.h + Library.h Library.cpp + Memory.h Memory.cpp + Ptr.h + RefCounted.h + StrLib.h StrLib.cpp + Stream.h + StdStream.h + TextWriter.h TextWriter.cpp + Timer.h Timer.cpp + Utils.h) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) @@ -27,21 +27,21 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEFINITIONS(-DNVCORE_EXPORTS) IF(UNIX) - SET(LIBS ${LIBS} ${CMAKE_DL_LIBS}) + SET(LIBS ${LIBS} ${CMAKE_DL_LIBS}) ENDIF(UNIX) IF(NVCORE_SHARED) - ADD_DEFINITIONS(-DNVCORE_SHARED=1) - ADD_LIBRARY(nvcore SHARED ${CORE_SRCS}) + ADD_DEFINITIONS(-DNVCORE_SHARED=1) + ADD_LIBRARY(nvcore SHARED ${CORE_SRCS}) ELSE(NVCORE_SHARED) - ADD_LIBRARY(nvcore ${CORE_SRCS}) + ADD_LIBRARY(nvcore ${CORE_SRCS}) ENDIF(NVCORE_SHARED) TARGET_LINK_LIBRARIES(nvcore ${LIBS}) INSTALL(TARGETS nvcore EXPORT nvcore-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static) INSTALL(EXPORT nvcore-targets DESTINATION share/cmake) diff --git a/src/nvimage/CMakeLists.txt b/src/nvimage/CMakeLists.txt index a9be900..5b09e6c 100644 --- a/src/nvimage/CMakeLists.txt +++ b/src/nvimage/CMakeLists.txt @@ -1,63 +1,63 @@ PROJECT(nvimage) SET(IMAGE_SRCS - nvimage.h - BlockDXT.h BlockDXT.cpp - ColorBlock.h ColorBlock.cpp - DirectDrawSurface.h DirectDrawSurface.cpp - ErrorMetric.h ErrorMetric.cpp - Filter.h Filter.cpp - FloatImage.h FloatImage.cpp - Image.h Image.cpp - ImageIO.h ImageIO.cpp - #KtxFile.h KtxFile.cpp - NormalMap.h NormalMap.cpp - PixelFormat.h - PsdFile.h - TgaFile.h) + nvimage.h + BlockDXT.h BlockDXT.cpp + ColorBlock.h ColorBlock.cpp + DirectDrawSurface.h DirectDrawSurface.cpp + ErrorMetric.h ErrorMetric.cpp + Filter.h Filter.cpp + FloatImage.h FloatImage.cpp + Image.h Image.cpp + ImageIO.h ImageIO.cpp + #KtxFile.h KtxFile.cpp + NormalMap.h NormalMap.cpp + PixelFormat.h + PsdFile.h + TgaFile.h) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) IF(PNG_FOUND) - SET(LIBS ${LIBS} ${PNG_LIBRARIES}) - INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + SET(LIBS ${LIBS} ${PNG_LIBRARIES}) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) ENDIF(PNG_FOUND) IF(JPEG_FOUND) - SET(LIBS ${LIBS} ${JPEG_LIBRARIES}) - INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) + SET(LIBS ${LIBS} ${JPEG_LIBRARIES}) + INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) ENDIF(JPEG_FOUND) IF(TIFF_FOUND) - SET(LIBS ${LIBS} ${TIFF_LIBRARIES}) - INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) + SET(LIBS ${LIBS} ${TIFF_LIBRARIES}) + INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) ENDIF(TIFF_FOUND) IF(OPENEXR_FOUND) - SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES}) - INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS}) + SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES}) + INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS}) ENDIF(OPENEXR_FOUND) IF(FREEIMAGE_FOUND) - SET(LIBS ${LIBS} ${FREEIMAGE_LIBRARIES}) - INCLUDE_DIRECTORIES(${FREEIMAGE_INCLUDE_PATH}) + SET(LIBS ${LIBS} ${FREEIMAGE_LIBRARIES}) + INCLUDE_DIRECTORIES(${FREEIMAGE_INCLUDE_PATH}) ENDIF(FREEIMAGE_FOUND) # targets ADD_DEFINITIONS(-DNVIMAGE_EXPORTS) IF(NVIMAGE_SHARED) - ADD_DEFINITIONS(-DNVIMAGE_SHARED=1) - ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS} $ $ $) + ADD_DEFINITIONS(-DNVIMAGE_SHARED=1) + ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS} $ $ $) ELSE(NVIMAGE_SHARED) - ADD_LIBRARY(nvimage ${IMAGE_SRCS} $ $ $) + ADD_LIBRARY(nvimage ${IMAGE_SRCS} $ $ $) ENDIF(NVIMAGE_SHARED) TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath) INSTALL(TARGETS nvimage EXPORT nvimage-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static) INSTALL(EXPORT nvimage-targets DESTINATION share/cmake) diff --git a/src/nvmath/CMakeLists.txt b/src/nvmath/CMakeLists.txt index 1a59542..147f0ff 100644 --- a/src/nvmath/CMakeLists.txt +++ b/src/nvmath/CMakeLists.txt @@ -1,16 +1,16 @@ PROJECT(nvmath) SET(MATH_SRCS - nvmath.h - Box.h Box.inl - Color.h Color.inl - Fitting.h Fitting.cpp - Half.h Half.cpp - Matrix.h - Plane.h Plane.inl Plane.cpp - SphericalHarmonic.h SphericalHarmonic.cpp - SimdVector.h SimdVector_SSE.h SimdVector_VE.h - Vector.h Vector.inl) + nvmath.h + Box.h Box.inl + Color.h Color.inl + Fitting.h Fitting.cpp + Half.h Half.cpp + Matrix.h + Plane.h Plane.inl Plane.cpp + SphericalHarmonic.h SphericalHarmonic.cpp + SimdVector.h SimdVector_SSE.h SimdVector_VE.h + Vector.h Vector.inl) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) @@ -18,10 +18,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEFINITIONS(-DNVMATH_EXPORTS) IF(NVMATH_SHARED) - ADD_DEFINITIONS(-DNVMATH_SHARED=1) - ADD_LIBRARY(nvmath SHARED ${MATH_SRCS}) + ADD_DEFINITIONS(-DNVMATH_SHARED=1) + ADD_LIBRARY(nvmath SHARED ${MATH_SRCS}) ELSE(NVMATH_SHARED) - ADD_LIBRARY(nvmath ${MATH_SRCS}) + ADD_LIBRARY(nvmath ${MATH_SRCS}) ENDIF(NVMATH_SHARED) TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore) diff --git a/src/nvtt/CMakeLists.txt b/src/nvtt/CMakeLists.txt index 54601b7..ec0a068 100644 --- a/src/nvtt/CMakeLists.txt +++ b/src/nvtt/CMakeLists.txt @@ -3,38 +3,38 @@ PROJECT(nvtt) ADD_SUBDIRECTORY(squish) SET(NVTT_SRCS - nvtt.h nvtt.cpp - nvtt_wrapper.h nvtt_wrapper.cpp - ClusterFit.h ClusterFit.cpp - Compressor.h - BlockCompressor.h BlockCompressor.cpp - CompressorDX9.h CompressorDX9.cpp - CompressorDX10.h CompressorDX10.cpp - CompressorDX11.h CompressorDX11.cpp - CompressorDXT1.h CompressorDXT1.cpp - CompressorDXT5_RGBM.h CompressorDXT5_RGBM.cpp - CompressorRGB.h CompressorRGB.cpp - Context.h Context.cpp - QuickCompressDXT.h QuickCompressDXT.cpp - OptimalCompressDXT.h OptimalCompressDXT.cpp - SingleColorLookup.h SingleColorLookup.cpp - CompressionOptions.h CompressionOptions.cpp - InputOptions.h InputOptions.cpp - OutputOptions.h OutputOptions.cpp - TaskDispatcher.h #TaskDispatcher.cpp - Surface.h Surface.cpp - CubeSurface.h CubeSurface.cpp - cuda/CudaUtils.h cuda/CudaUtils.cpp - cuda/CudaMath.h - cuda/BitmapTable.h - cuda/CudaCompressorDXT.h cuda/CudaCompressorDXT.cpp) + nvtt.h nvtt.cpp + nvtt_wrapper.h nvtt_wrapper.cpp + ClusterFit.h ClusterFit.cpp + Compressor.h + BlockCompressor.h BlockCompressor.cpp + CompressorDX9.h CompressorDX9.cpp + CompressorDX10.h CompressorDX10.cpp + CompressorDX11.h CompressorDX11.cpp + CompressorDXT1.h CompressorDXT1.cpp + CompressorDXT5_RGBM.h CompressorDXT5_RGBM.cpp + CompressorRGB.h CompressorRGB.cpp + Context.h Context.cpp + QuickCompressDXT.h QuickCompressDXT.cpp + OptimalCompressDXT.h OptimalCompressDXT.cpp + SingleColorLookup.h SingleColorLookup.cpp + CompressionOptions.h CompressionOptions.cpp + InputOptions.h InputOptions.cpp + OutputOptions.h OutputOptions.cpp + TaskDispatcher.h #TaskDispatcher.cpp + Surface.h Surface.cpp + CubeSurface.h CubeSurface.cpp + cuda/CudaUtils.h cuda/CudaUtils.cpp + cuda/CudaMath.h + cuda/BitmapTable.h + cuda/CudaCompressorDXT.h cuda/CudaCompressorDXT.cpp) IF (CUDA_FOUND) - ADD_DEFINITIONS(-DHAVE_CUDA) - CUDA_COMPILE(CUDA_SRCS cuda/CompressKernel.cu) - SET(NVTT_SRCS ${NVTT_SRCS} ${CUDA_SRCS}) - SET(LIBS ${LIBS} ${CUDA_LIBRARIES}) - INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) + ADD_DEFINITIONS(-DHAVE_CUDA) + CUDA_COMPILE(CUDA_SRCS cuda/CompressKernel.cu) + SET(NVTT_SRCS ${NVTT_SRCS} ${CUDA_SRCS}) + SET(LIBS ${LIBS} ${CUDA_LIBRARIES}) + INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) ENDIF (CUDA_FOUND) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) @@ -42,9 +42,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_DEFINITIONS(-DNVTT_EXPORTS) IF(NVTT_SHARED) - ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS} $) + ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS} $) ELSE(NVTT_SHARED) - ADD_LIBRARY(nvtt ${NVTT_SRCS} $) + ADD_LIBRARY(nvtt ${NVTT_SRCS} $) ENDIF(NVTT_SHARED) 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) INSTALL(TARGETS nvtt EXPORT nvtt-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib/static) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib/static) INSTALL(EXPORT nvtt-targets DESTINATION share/cmake)