Update version number.

Add badges.

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: castano

.github/workflows/build.yml

@@ -0,0 +1,33 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  vs2017:
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v2
+    - uses: microsoft/setup-msbuild@v1.0.0
+    - name: Build Debug/x64
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Debug /property:Platform=x64
+    - name: Build Debug/Win32
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Debug /property:Platform=Win32
+    - name: Build Release/x64
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Release /property:Platform=x64
+    - name: Build Release/Win32
+      run: msbuild .\project\vc2017\nvtt.sln /property:Configuration=Release /property:Platform=Win32
+      
+  unix:
+    strategy:
+      matrix:
+        os: [ubuntu, macos]
+    name: ${{matrix.os}}
+    runs-on: ${{matrix.os}}-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: make
+      run: |
+        ./configure --debug
+        make
+        ./configure --release
+        make

.gitignore

@@ -0,0 +1,17 @@
+**/bin/
+**/obj/
+**/Debug/
+**/Release/
+**/Debug.x64/
+**/Release.x64/
+**/Debug.Win32/
+**/Release.Win32/
+**/Debug-CUDA/
+**/Release-CUDA/
+*.vcxproj.user
+*.opensdf
+*.sdf
+*.suo
+build
+.vs
+project/nvtt.sublime-workspace

CMakeLists.txt

@@ -1,34 +1,28 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
 PROJECT(NV)
 ENABLE_TESTING()
 
 SET(NV_CMAKE_DIR "${NV_SOURCE_DIR}/cmake")
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${NV_CMAKE_DIR}")
 
-IF(WIN32)
-	# gnuwin32 paths:
-	SET(GNUWIN32_PATH "${NV_SOURCE_DIR}/extern/gnuwin32")
-	SET(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${GNUWIN32_PATH}/include")
-	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${GNUWIN32_PATH}/lib")
-	
-	# Set GLUT path:
-	SET(GLUT_ROOT_DIR "${NV_SOURCE_DIR}/extern/glut")
-
-	# Set FreeImage path:
-	SET(FREEIMAGE_ROOT_DIR "${NV_SOURCE_DIR}/extern/FreeImage")
-	
-ENDIF(WIN32)
+# Compiler check (needs -std:c++11 flag)
+include(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_STANDARD 11)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+else()
+    message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+endif()
 
 INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
-MESSAGE(STATUS "Setting optimal options")
-MESSAGE(STATUS "  Processor: ${NV_SYSTEM_PROCESSOR}")
-MESSAGE(STATUS "  Compiler Flags: ${CMAKE_CXX_FLAGS}")
 
-IF(NVTT_SHARED)
-	SET(NVCORE_SHARED TRUE)
-	SET(NVMATH_SHARED TRUE)
-	SET(NVIMAGE_SHARED TRUE)
-ENDIF(NVTT_SHARED)
+IF(CMAKE_BUILD_TYPE MATCHES "debug")
+    SET(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Postfix for debug build libraries.")
+    ADD_DEFINITIONS(-D_DEBUG=1)
+ENDIF()
+
 
 ADD_SUBDIRECTORY(extern)
 
@@ -36,9 +30,8 @@ ADD_SUBDIRECTORY(src)
 
 # These files should only be installed when creating packages.
 INSTALL(FILES 
-	NVIDIA_Texture_Tools_LICENSE.txt
-	NVIDIA_Texture_Tools_README.txt
-	ChangeLog 
+	LICENSE
+	README.md
 	DESTINATION share/doc/nvtt)
 
 # Add packaging support
@@ -51,20 +44,20 @@ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 SET(CPACK_PACKAGE_NAME "nvidia-texture-tools")
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(CPACK_PACKAGE_VERSION "2.1.0")
-SET(CPACK_PACKAGE_CONTACT "Ignacio Casta<74>o <icastano@nvidia.com>")
-SET(CPACK_PACKAGE_VENDOR "NVIDIA Corporation")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GPU-accelerated Texture Tools with support for DirectX 10 texture formats")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_PACKAGE_VERSION "2.1.2")
+SET(CPACK_PACKAGE_CONTACT "Ignacio Casta<74>o <castano@gmail.com>")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Texture processing tools with support for Direct3D 10 and 11 formats.")
 
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${NV_SOURCE_DIR}/NVIDIA_Texture_Tools_README.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${NV_SOURCE_DIR}/NVIDIA_Texture_Tools_LICENSE.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${NV_SOURCE_DIR}/README.md")
+SET(CPACK_RESOURCE_FILE_LICENSE "${NV_SOURCE_DIR}/LICENSE")
 
 # NSIS options:
 IF(WIN32)
 	SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_VENDOR}\\\\NVIDIA Texture Tools 2.1")
 	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\NVIDIA Texture Tools 2.1")
-	SET(CPACK_PACKAGE_ICON "${NV_SOURCE_DIR}\\\\project\\\\vc8\\\\nvcompress\\\\nvidia.ico")
+	SET(CPACK_PACKAGE_ICON "${NV_SOURCE_DIR}\\\\project\\\\vc2017\\\\nvcompress\\\\nvidia.ico")
 ENDIF(WIN32)
 
 INCLUDE(CPack)
+

ChangeLog

@@ -1,4 +1,12 @@
+NVIDIA Texture Tools version 2.1.2
+ * Use ICBC as the main BC1 compressor.
+ * Various fixes.
+
+NVIDIA Texture Tools version 2.1.1
+ * Various fixes.
+
 NVIDIA Texture Tools version 2.1.0
+ * Too many changes to list here.
  * CTX1 CUDA compressor.
  * DXT1n CUDA compressor.
  * Support alpha premultiplication by Charles Nicholson. See issue 30.

LICENSE

@@ -1,6 +1,7 @@
-NVIDIA Texture Tools 2.0 is licensed under the MIT license.
+NVIDIA Texture Tools is licensed under the MIT license.
 
-Copyright (c) 2007 NVIDIA Corporation
+Copyright (c) 2009-2020 Ignacio Castaño
+Copyright (c) 2007-2009 NVIDIA Corporation
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

NVIDIA_Texture_Tools_README.txt

@@ -1,187 +0,0 @@
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
-NVIDIA Texture Tools
-README.txt
-Version 2.1
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------
-TABLE OF CONTENTS
---------------------------------------------------------------------------------
-I.   Instructions
-II.  Contents
-III. Compilation Instructions
-IV.  Using NVIDIA Texture Tools in your own applications
-V.   Known Issues
-VI.  Frequently Asked Questions
---------------------------------------------------------------------------------
-
-I.   Introduction
---------------------------------------------------------------------------------
-
-The NVIDIA Texture Tools is a collection of image processing and texture 
-manipulation tools, designed to be integrated in game tools and asset 
-conditioning pipelines.
-
-The primary features of the library are mipmap and normal map generation, format 
-conversion and DXT compression.
-
-DXT compression is based on Simon Brown's squish library. The library also 
-contains an alternative GPU-accelerated compressor that uses CUDA and on some
-GPUs is one order of magnitude faster.
-
-You can obtain CUDA from our developer site at:
-
-http://developer.nvidia.com/object/cuda.html
-
-The source code of the Texture Tools is being released under the terms of 
-the MIT license.
-
-The latest installer is available at the official website:
-
-http://developer.nvidia.com/object/texture_tools.html
-
-Documentation and additional information can be found at the development site:
-
-http://code.google.com/p/nvidia-texture-tools/
-
-
-II.  Contents
---------------------------------------------------------------------------------
-
-This release contains only the source code of the texture compression library
-and several command line applications that serve as examples of how to use the
-library. 
-
-Documentation for the texture compression library is available at:
-
-http://code.google.com/p/nvidia-texture-tools/wiki/ApiDocumentation
-
-A brief description of the command line tools can be found at:
-
-http://code.google.com/p/nvidia-texture-tools/wiki/CommandLineTools
-
-
-III. Compilation Instructions
---------------------------------------------------------------------------------
-
-The compression library and the example can be compiled with Visual Studio 8 on 
-Windows using the following solution file:
-
-project\vc8\nvtt.sln
-
-On most other platforms you can also use cmake. For more information about 
-cmake, visit:
-
-http://www.cmake.org/
-
-On unix systems you can use the standard build procedure (assuming cmake is 
-installed on your system):
-
-$ ./configure
-$ make
-$ sudo make install
-
-
-IV.  Using NVIDIA Texture Tools
---------------------------------------------------------------------------------
-
-To use the NVIDIA Texture Tools in your own applications you just have to
-include the following header file:
-
-src/nvimage/nvtt/nvtt.h
-
-And include the nvtt library in your projects. 
-
-The following file contains a simple example that shows how to use the library:
-
-src/nvimage/nvtt/compress.cpp
-
-Detailed documentation of the API can be found at:
-
-http://code.google.com/p/nvidia-texture-tools/wiki/ApiDocumentation
-
-The usage of the commandline compression tool is the following:
-
-$ nvcompress [options] infile [outfile]
-
-where 'infile' is and TGA, PNG, PSD, DDS or JPG file, 'outfile' is a DDS file
-and 'options' is one or more of the following:
-
-Input options:
-  -color     	The input image is a color map (default).
-  -alpha     	The input image has an alpha channel used for transparency.
-  -normal    	The input image is a normal map.
-  -tonormal  	Convert input to normal map.
-  -clamp     	Clamp wrapping mode (default).
-  -repeat    	Repeat wrapping mode.
-  -nomips    	Disable mipmap generation.
-  -premula   	Premultiply alpha into color channel.
-  -mipfilter 	Mipmap filter. One of the following: box, triangle, kaiser.
-
-Compression options:
-  -fast    	Fast compression.
-  -nocuda  	Do not use cuda compressor.
-  -rgb     	RGBA format
-  -bc1     	BC1 format (DXT1)
-  -bc1n    	BC1 normal map format (DXT1nm)
-  -bc1a    	BC1 format with binary alpha (DXT1a)
-  -bc2     	BC2 format (DXT3)
-  -bc3     	BC3 format (DXT5)
-  -bc3n    	BC3 normal map format (DXT5nm)
-  -bc4     	BC4 format (ATI1)
-  -bc5     	BC5 format (3Dc/ATI2)
-
-Output options:
-  -silent  	Do not output progress messages
-  -dds10   	Use DirectX 10 DDS format
-
-In order to run the compiled example on a PC that doesn't have Microsoft Visual 
-Studio 2003 installed, you will have to install the Microsoft Visual Studio 2003
-redistributable package that you can download at:
-
-http://go.microsoft.com/fwlink/?linkid=65127&clcid=0x409
-
-
-V.   Known Issues
---------------------------------------------------------------------------------
-
-None so far. Please file suggestions and bug reports at:
-
-http://code.google.com/p/nvidia-texture-tools/issues/list
-
-or contact us directly:
-
-TextureTools@nvidia.com
-
-
-
-VI.  Frequently Asked Questions
---------------------------------------------------------------------------------
-
-=== Where can I ask questions? How can I get support? ===
-You can ask questions about the usage of the Texture Tools at the [http://developer.nvidia.com/forums/index.php?showforum=9 NVIDIA developer forums]. You can report bugs and request new features in our [http://code.google.com/p/nvidia-texture-tools/issues/list issue database]. If you are a developer and have questions about the API or the source code, feel free to drop by the [http://groups.google.com/group/nvidia-texture-tools developer's mailing list]. If you would like to contact us privately, please send an email to [mailto:TextureTools@nvidia.com TextureTools@nvidia.com].
-
-=== Why is feature XYZ not supported? ===
-In order to keep the code small and reduce maintenance costs we have limited the features available in our new texture tools. For this reason, we have also open sourced the code, so that people can modify it and add their own custom features.
-
-=== What platforms do the NVIDIA Texture Tools support? ===
-The tools are compiled and tested regularly on Linux, OSX, and Windows. Some platforms are tested more frequently than others and there may be bugs on some uncommon configurations.
-
-=== Is CUDA required? ===
-No. The Visual Studio solution file contains a configuration that allows you to compile the texture tools without CUDA support. The cmake scripts automatically detect the CUDA installation and use it only when available.
-
-Even if the texture tools are compiled with CUDA support it's possible to use them on systems that do not support CUDA or that do not have a valid CUDA driver installed.
-
-=== Where can I get CUDA? ===
-At [http://developer.nvidia.com/object/cuda.html]
-
-=== Can I use the NVIDIA Texture Tools in my commercial application? ===
-Yes, the NVIDIA Texture Tools are licensed under the MIT license.
-
-=== Can I use the NVIDIA Texture Tools in my GPL application? ===
-Yes, the MIT license is compatible with the GPL and LGPL licenses.
-
-=== Can I use the NVIDIA Texture Tools in the US? Do I have to obtain a license of the S3TC patent (US patent 5,956,431)? ===
-NVIDIA has a license of the S3TC patent that covers all our products, including our Texture Tools. You don't have to obtain a license of the S3TC patent to use any of NVIDIA's products, but certain uses of NVIDIA Texture Tools source code cannot be considered NVIDIA products anymore. Keep in mind that the NVIDIA Texture Tools are licensed under the MIT license and thus are provided without warranty of any kind.

README.md

@@ -0,0 +1,43 @@
+# NVIDIA Texture Tools [![Actions Status](https://github.com/castano/nvidia-texture-tools/workflows/build/badge.svg)](https://github.com/castano/nvidia-texture-tools/actions) ![MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub](https://img.shields.io/badge/repo-github-green.svg)](https://github.com/castano/nvidia-texture-tools)
+
+The NVIDIA Texture Tools is a collection of image processing and texture 
+manipulation tools, designed to be integrated in game tools and asset 
+processing pipelines.
+
+The primary features of the library are mipmap and normal map generation, format 
+conversion, and DXT compression.
+
+
+### How to build (Windows)
+
+Use the provided Visual Studio 2017 solution `project/vc2017/thekla.sln`.
+
+
+### How to build (Linux/OSX)
+
+Use [cmake](http://www.cmake.org/) and the provided configure script:
+
+```bash
+$ ./configure
+$ make
+$ sudo make install
+```
+
+
+### Using NVIDIA Texture Tools
+
+To use the NVIDIA Texture Tools in your own applications you just have to
+include the following header file:
+
+[src/nvtt/nvtt.h](https://github.com/castano/nvidia-texture-tools/blob/master/src/nvtt/nvtt.h)
+
+And include the nvtt library in your projects. 
+
+The following file contains a simple example that shows how to use the library:
+
+[src/nvtt/tools/compress.cpp](https://github.com/castano/nvidia-texture-tools/blob/master/src/nvtt/tools/compress.cpp)
+
+Detailed documentation of the API can be found at:
+
+https://github.com/castano/nvidia-texture-tools/wiki/ApiDocumentation
+

VERSION

@@ -1 +1 @@
-2.1.0
+2.1.2

buildpkg

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-tar zcvf nvidia-texture-tools-`cat VERSION`.tar.gz \
-	--exclude '.*' --exclude debian --exclude '*~' --exclude buildpkg \
-	--exclude 'build-*' --exclude data --exclude tags --exclude Makefile \
-	--exclude qtcreator-build --exclude 'nvidia-texture-tools-*.tar.gz' \
-	--exclude '*.user' --transform 's,^,nvidia-texture-tools/,' *

cmake/DetermineProcessor.cmake

@@ -1,68 +0,0 @@
-
-# Assume i586 by default.
-SET(NV_SYSTEM_PROCESSOR "i586")
-
-IF(UNIX)
-	FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
-	IF(CMAKE_UNAME)
-		EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR RETURN_VALUE val)
-
-		IF("${val}" GREATER 0 OR NV_SYSTEM_PROCESSOR STREQUAL "unknown")
-			EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE NV_SYSTEM_PROCESSOR RETURN_VALUE val)
-		ENDIF("${val}" GREATER 0 OR NV_SYSTEM_PROCESSOR STREQUAL "unknown")
-
-		# processor may have double quote in the name, and that needs to be removed
-		STRING(REGEX REPLACE "\"" "" NV_SYSTEM_PROCESSOR "${NV_SYSTEM_PROCESSOR}")
-		STRING(REGEX REPLACE "/" "_" NV_SYSTEM_PROCESSOR "${NV_SYSTEM_PROCESSOR}")
-	ENDIF(CMAKE_UNAME)
-
-#~ 	# Get extended processor information from /proc/cpuinfo
-#~ 	IF(EXISTS "/proc/cpuinfo")
-
-#~ 		FILE(READ /proc/cpuinfo PROC_CPUINFO)
-
-#~ 		SET(VENDOR_ID_RX "vendor_id[ \t]*:[ \t]*([a-zA-Z]+)\n")
-#~ 		STRING(REGEX MATCH "${VENDOR_ID_RX}" VENDOR_ID "${PROC_CPUINFO}")
-#~ 		STRING(REGEX REPLACE "${VENDOR_ID_RX}" "\\1" VENDOR_ID "${VENDOR_ID}")
-
-#~ 		SET(CPU_FAMILY_RX "cpu family[ \t]*:[ \t]*([0-9]+)")
-#~ 		STRING(REGEX MATCH "${CPU_FAMILY_RX}" CPU_FAMILY "${PROC_CPUINFO}")
-#~ 		STRING(REGEX REPLACE "${CPU_FAMILY_RX}" "\\1" CPU_FAMILY "${CPU_FAMILY}")
-
-#~ 		SET(MODEL_RX "model[ \t]*:[ \t]*([0-9]+)")
-#~ 		STRING(REGEX MATCH "${MODEL_RX}" MODEL "${PROC_CPUINFO}")
-#~ 		STRING(REGEX REPLACE "${MODEL_RX}" "\\1" MODEL "${MODEL}")
-
-#~ 		SET(FLAGS_RX "flags[ \t]*:[ \t]*([a-zA-Z0-9 _]+)\n")
-#~ 		STRING(REGEX MATCH "${FLAGS_RX}" FLAGS "${PROC_CPUINFO}")
-#~ 		STRING(REGEX REPLACE "${FLAGS_RX}" "\\1" FLAGS "${FLAGS}")
-
-#~ 		# Debug output.
-#~ 		IF(LINUX_CPUINFO)
-#~ 			MESSAGE(STATUS "LinuxCPUInfo.cmake:")
-#~ 			MESSAGE(STATUS "VENDOR_ID : ${VENDOR_ID}")
-#~ 			MESSAGE(STATUS "CPU_FAMILY : ${CPU_FAMILY}")
-#~ 			MESSAGE(STATUS "MODEL : ${MODEL}")
-#~ 			MESSAGE(STATUS "FLAGS : ${FLAGS}")
-#~ 		ENDIF(LINUX_CPUINFO)
-
-#~ 	ENDIF(EXISTS "/proc/cpuinfo")
-
-#~		# Information on how to decode CPU_FAMILY and MODEL:
-#~		# http://balusc.xs4all.nl/srv/har-cpu-int-pm.php
-
-ELSE(UNIX)
-
-  IF(WIN32)
-    # It's not OK to trust $ENV{PROCESSOR_ARCHITECTURE}: its value depends on the type of executable being run,
-	# so a 32-bit cmake (the default binary distribution) will always say "x86" regardless of the actual target.
-	IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
-      SET (NV_SYSTEM_PROCESSOR "AMD64")
-	ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	  SET (NV_SYSTEM_PROCESSOR "x86")
-	ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  ENDIF(WIN32)
-
-ENDIF(UNIX)
-
-

cmake/FindCg.cmake

@@ -1,172 +0,0 @@
-#
-# Try to find NVIDIA's Cg compiler, runtime libraries, and include path.
-# Once done this will define
-#
-# CG_FOUND =system has NVIDIA Cg and it can be used. 
-# CG_INCLUDE_PATH = directory where cg.h resides
-# CG_LIBRARY = full path to libCg.so (Cg.DLL on win32)
-# CG_GL_LIBRARY = full path to libCgGL.so (CgGL.dll on win32)
-# CG_COMPILER = full path to cgc (cgc.exe on win32)
-# 
-
-# On OSX default to using the framework version of Cg.
-IF (APPLE)
-  INCLUDE(${CMAKE_ROOT}/Modules/CMakeFindFrameworks.cmake)
-  SET(CG_FRAMEWORK_INCLUDES)
-  CMAKE_FIND_FRAMEWORKS(Cg)
-  IF (Cg_FRAMEWORKS)
-    FOREACH(dir ${Cg_FRAMEWORKS})
-      SET(CG_FRAMEWORK_INCLUDES ${CG_FRAMEWORK_INCLUDES}
-        ${dir}/Headers ${dir}/PrivateHeaders)
-    ENDFOREACH(dir)
-
-    # Find the include  dir
-    FIND_PATH(CG_INCLUDE_PATH cg.h
-      ${CG_FRAMEWORK_INCLUDES}
-      )
-
-    # Since we are using Cg framework, we must link to it.
-	# Note, we use weak linking, so that it works even when Cg is not available.
-    SET(CG_LIBRARY "-weak_framework Cg" CACHE STRING "Cg library")
-    SET(CG_GL_LIBRARY "-weak_framework Cg" CACHE STRING "Cg GL library")
-  ENDIF (Cg_FRAMEWORKS)
-  FIND_PROGRAM(CG_COMPILER cgc
-    /usr/bin
-    /usr/local/bin
-    DOC "The Cg compiler"
-    )
-ELSE (APPLE)
-  IF (WIN32)
- 
-    # When compiling 64-bit programs, the binaries and libs are in bin.x64 and lib.x64 directories,
-	
-	# This will have only effect for 64bit versions of cmake, when running the default 32bit version
-	# both ProgramFiles and ProgramFiles(x86) point to the same place in Win64
-	SET(PFx86_VARNAME "ProgramFiles(x86)")
-    SET(PFx86 $ENV{${PFx86_VARNAME}})
-	
-	# Let's play safe in case we are cross compiling to 64 bit: for cgc it doesn't really matter
-	FIND_PROGRAM( CG_COMPILER cgc
-      $ENV{CG_BIN64_PATH}
-	  $ENV{CG_BIN_PATH}
-      $ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/bin
-	  $ENV{PFx86}/NVIDIA\ Corporation/Cg/bin
-      $ENV{PROGRAMFILES}/Cg
-      ${PROJECT_SOURCE_DIR}/../Cg
-      DOC "The Cg Compiler"
-    )
-
-    IF (CG_COMPILER)
-      GET_FILENAME_COMPONENT(CG_COMPILER_DIR ${CG_COMPILER} PATH)
-      GET_FILENAME_COMPONENT(CG_COMPILER_SUPER_DIR ${CG_COMPILER_DIR} PATH)
-    ELSE (CG_COMPILER)
-      SET (CG_COMPILER_DIR .)
-      SET (CG_COMPILER_SUPER_DIR ..)
-    ENDIF (CG_COMPILER)
-    FIND_PATH( CG_INCLUDE_PATH Cg/cg.h
-      $ENV{CG_INC_PATH}
-      $ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/include
-      $ENV{PROGRAMFILES}/Cg
-      ${PROJECT_SOURCE_DIR}/../Cg
-      ${CG_COMPILER_SUPER_DIR}/include
-      ${CG_COMPILER_DIR}
-      DOC "The directory where Cg/cg.h resides"
-      )
-	
-	IF (NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-      FIND_LIBRARY( CG_LIBRARY
-        NAMES Cg
-        PATHS
-        $ENV{CG_LIB64_PATH}
-        $ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/lib.x64
-		$ENV{PFx86}/NVIDIA\ Corporation/Cg/lib.x64
-        $ENV{PROGRAMFILES}/Cg
-        $ENV{PFx86}/Cg
-        ${PROJECT_SOURCE_DIR}/../Cg
-        ${CG_COMPILER_SUPER_DIR}/lib.x64
-        ${CG_COMPILER_DIR}
-        DOC "The Cg runtime library (64-bit)"
-        )
-      FIND_LIBRARY( CG_GL_LIBRARY
-        NAMES CgGL
-        PATHS
-		$ENV{CG_LIB64_PATH}
-        $ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/lib.x64
-		$ENV{PFx86}/NVIDIA\ Corporation/Cg/lib.x64
-        $ENV{PROGRAMFILES}/Cg
-		$ENV{PFx86}/Cg
-        ${PROJECT_SOURCE_DIR}/../Cg
-        ${CG_COMPILER_SUPER_DIR}/lib.x64
-        ${CG_COMPILER_DIR}
-        DOC "The Cg GL runtime library (64-bit)"
-        )
-	ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-      FIND_LIBRARY( CG_LIBRARY
-        NAMES Cg
-        PATHS
-        $ENV{CG_LIB_PATH}
-        $ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/lib
-        $ENV{PROGRAMFILES}/Cg
-        ${PROJECT_SOURCE_DIR}/../Cg
-        ${CG_COMPILER_SUPER_DIR}/lib
-        ${CG_COMPILER_DIR}
-        DOC "The Cg runtime library"
-        )
-      FIND_LIBRARY( CG_GL_LIBRARY
-        NAMES CgGL
-        PATHS
-		$ENV{CG_LIB_PATH}
-        $ENV{PROGRAMFILES}/NVIDIA\ Corporation/Cg/lib
-        $ENV{PROGRAMFILES}/Cg
-        ${PROJECT_SOURCE_DIR}/../Cg
-        ${CG_COMPILER_SUPER_DIR}/lib
-        ${CG_COMPILER_DIR}
-        DOC "The Cg GL runtime library"
-        )
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-
-  ELSE (WIN32)
-    FIND_PROGRAM( CG_COMPILER cgc
-      /usr/bin
-      /usr/local/bin
-      DOC "The Cg Compiler"
-      )
-    GET_FILENAME_COMPONENT(CG_COMPILER_DIR "${CG_COMPILER}" PATH)
-    GET_FILENAME_COMPONENT(CG_COMPILER_SUPER_DIR "${CG_COMPILER_DIR}" PATH)
-    FIND_PATH( CG_INCLUDE_PATH Cg/cg.h
-      /usr/include
-      /usr/local/include
-      ${CG_COMPILER_SUPER_DIR}/include
-      DOC "The directory where Cg/cg.h resides"
-      )
-    FIND_LIBRARY( CG_LIBRARY Cg
-      PATHS
-      /usr/lib64
-      /usr/lib
-      /usr/local/lib64
-      /usr/local/lib
-      ${CG_COMPILER_SUPER_DIR}/lib64
-      ${CG_COMPILER_SUPER_DIR}/lib
-      DOC "The Cg runtime library"
-      )
-	SET(CG_LIBRARY ${CG_LIBRARY} -lpthread)
-    FIND_LIBRARY( CG_GL_LIBRARY CgGL
-      PATHS
-      /usr/lib64
-      /usr/lib
-      /usr/local/lib64
-      /usr/local/lib
-      ${CG_COMPILER_SUPER_DIR}/lib64
-      ${CG_COMPILER_SUPER_DIR}/lib
-      DOC "The Cg runtime library"
-      )
-  ENDIF (WIN32)
-ENDIF (APPLE)
-
-IF (CG_INCLUDE_PATH)
-  SET( CG_FOUND 1 CACHE STRING "Set to 1 if CG is found, 0 otherwise")
-ELSE (CG_INCLUDE_PATH)
-  SET( CG_FOUND 0 CACHE STRING "Set to 1 if CG is found, 0 otherwise")
-ENDIF (CG_INCLUDE_PATH)
-
-MARK_AS_ADVANCED( CG_FOUND )

cmake/FindDirectX.cmake

@@ -1,38 +0,0 @@
-
-IF (WIN32)
-
-	FIND_PATH(DX9_INCLUDE_PATH d3d9.h
-		PATHS
-			"$ENV{DXSDK_DIR}/Include"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include"
-		DOC "The directory where D3D9.h resides")
-
-	FIND_PATH(DX10_INCLUDE_PATH D3D10.h
-		PATHS
-			"$ENV{DXSDK_DIR}/Include"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Include"
-		DOC "The directory where D3D10.h resides")
-
-	FIND_LIBRARY(D3D10_LIBRARY d3d10.lib
-		PATHS
-			"$ENV{DXSDK_DIR}/Lib/x86"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86"
-		DOC "The directory where d3d10.lib resides")
-
-	FIND_LIBRARY(D3DX10_LIBRARY d3dx10.lib
-		PATHS
-			"$ENV{DXSDK_DIR}/Lib/x86"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK/Lib/x86"
-		DOC "The directory where d3dx10.lib resides")
-
-	SET(DX10_LIBRARIES ${D3D10_LIBRARY} ${D3DX10_LIBRARY})
-
-ENDIF (WIN32)
-
-IF (DX10_INCLUDE_PATH)
-	SET( DX10_FOUND 1 CACHE STRING "Set to 1 if CG is found, 0 otherwise")
-ELSE (DX10_INCLUDE_PATH)
-	SET( DX10_FOUND 0 CACHE STRING "Set to 1 if CG is found, 0 otherwise")
-ENDIF (DX10_INCLUDE_PATH)
-
-MARK_AS_ADVANCED( DX10_FOUND )

cmake/FindFreeImage.cmake

@@ -1,53 +0,0 @@
-#
-# Try to find the FreeImage library and include path.
-# Once done this will define
-#
-# FREEIMAGE_FOUND
-# FREEIMAGE_INCLUDE_PATH
-# FREEIMAGE_LIBRARY
-# 
-
-IF (WIN32)
-	FIND_PATH( FREEIMAGE_INCLUDE_PATH FreeImage.h
-		${FREEIMAGE_ROOT_DIR}/include
-		${FREEIMAGE_ROOT_DIR}
-		DOC "The directory where FreeImage.h resides")
-	FIND_LIBRARY( FREEIMAGE_LIBRARY
-		NAMES FreeImage freeimage
-		PATHS
-		${FREEIMAGE_ROOT_DIR}/lib
-		${FREEIMAGE_ROOT_DIR}
-		DOC "The FreeImage library")
-ELSE (WIN32)
-	FIND_PATH( FREEIMAGE_INCLUDE_PATH FreeImage.h
-		/usr/include
-		/usr/local/include
-		/sw/include
-		/opt/local/include
-		DOC "The directory where FreeImage.h resides")
-	FIND_LIBRARY( FREEIMAGE_LIBRARY
-		NAMES FreeImage freeimage
-		PATHS
-		/usr/lib64
-		/usr/lib
-		/usr/local/lib64
-		/usr/local/lib
-		/sw/lib
-		/opt/local/lib
-		DOC "The FreeImage library")
-ENDIF (WIN32)
-
-SET(FREEIMAGE_LIBRARIES ${FREEIMAGE_LIBRARY})
-
-IF (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
-	SET( FREEIMAGE_FOUND TRUE CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
-ELSE (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
-	SET( FREEIMAGE_FOUND FALSE CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
-ENDIF (FREEIMAGE_INCLUDE_PATH AND FREEIMAGE_LIBRARY)
-
-MARK_AS_ADVANCED(
-	FREEIMAGE_FOUND 
-	FREEIMAGE_LIBRARY
-	FREEIMAGE_LIBRARIES
-	FREEIMAGE_INCLUDE_PATH)
-

cmake/FindGLEW.cmake

@@ -1,62 +0,0 @@
-#
-# Try to find GLEW library and include path.
-# Once done this will define
-#
-# GLEW_FOUND
-# GLEW_INCLUDE_PATH
-# GLEW_LIBRARY
-# 
-
-IF (WIN32)
-	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
-		$ENV{PROGRAMFILES}/GLEW/include
-		${GLEW_ROOT_DIR}/include
-		DOC "The directory where GL/glew.h resides")
-
-	IF (NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-		FIND_LIBRARY( GLEW_LIBRARY
-			NAMES glew64 glew64s
-			PATHS
-			$ENV{PROGRAMFILES}/GLEW/lib
-			${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
-	    	${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
-			DOC "The GLEW library (64-bit)"
-		)
-	ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-		FIND_LIBRARY( GLEW_LIBRARY
-			NAMES glew GLEW glew32 glew32s
-			PATHS
-			$ENV{PROGRAMFILES}/GLEW/lib
-			${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
-	    	${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
-			DOC "The GLEW library"
-		)
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
-ELSE (WIN32)
-	FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
-		/usr/include
-		/usr/local/include
-		/sw/include
-		/opt/local/include
-		${GLEW_ROOT_DIR}/include
-		DOC "The directory where GL/glew.h resides")
-
-	FIND_LIBRARY( GLEW_LIBRARY
-		NAMES GLEW glew
-		PATHS
-		/usr/lib64
-		/usr/lib
-		/usr/local/lib64
-		/usr/local/lib
-		/sw/lib
-		/opt/local/lib
-		${GLEW_ROOT_DIR}/lib
-		DOC "The GLEW library")
-ENDIF (WIN32)
-
-SET(GLEW_FOUND "NO")
-IF (GLEW_INCLUDE_PATH AND GLEW_LIBRARY)
-	SET(GLEW_LIBRARIES ${GLEW_LIBRARY})
-	SET(GLEW_FOUND "YES")
-ENDIF (GLEW_INCLUDE_PATH AND GLEW_LIBRARY)
-

cmake/FindMaya.cmake

@@ -1,67 +0,0 @@
-
-
-
-IF (WIN32)
-
-	# Maya plugins can only be compiled with msvc
-	IF (MSVC)
-
-		FIND_PATH(MAYA_INCLUDE_PATH maya/MTypes.h
-			PATHS
-				"$ENV{PROGRAMFILES}/Autodesk/Maya8.5/include"
-				"$ENV{MAYA_LOCATION}/include"
-			DOC "The directory where MTypes.h resides")
-
-		# Find maya version!
-
-		FIND_LIBRARY(MAYA_FOUNDATION_LIBRARY Foundation
-			PATHS
-				"$ENV{PROGRAMFILES}/Autodesk/Maya8.5/lib"
-				"$ENV{MAYA_LOCATION}/lib"
-			DOC "The directory where Foundation.lib resides")
-
-		FIND_LIBRARY(MAYA_OPENMAYA_LIBRARY OpenMaya
-			PATHS
-				"$ENV{PROGRAMFILES}/Autodesk/Maya8.5/lib"
-				"$ENV{MAYA_LOCATION}/lib"
-			DOC "The directory where OpenMaya.lib resides")
-
-		FIND_LIBRARY(MAYA_OPENMAYAANIM_LIBRARY OpenMayaAnim
-			PATHS
-				"$ENV{PROGRAMFILES}/Autodesk/Maya8.5/lib"
-				"$ENV{MAYA_LOCATION}/lib"
-			DOC "The directory where OpenMayaAnim.lib resides")
-
-		SET(MAYA_LIBRARIES 
-			${MAYA_FOUNDATION_LIBRARY}
-			${MAYA_OPENMAYA_LIBRARY}
-			${MAYA_OPENMAYAANIM_LIBRARY})
-
-		SET(MAYA_EXTENSION ".mll")
-
-	ENDIF (MSVC)
-ELSE (WIN32)
-
-	# On linux, check gcc version.
-
-	# OSX and Linux
-
-	FIND_PATH(MAYA_INCLUDE_PATH maya/MTypes.h
-		PATHS
-			/usr/autodesk/maya/include
-			$ENV{MAYA_LOCATION}/include
-		DOC "The directory where MTypes.h resides")
-
-# TODO
-
-ENDIF (WIN32)
-
-
-
-IF (MAYA_INCLUDE_PATH)
-	SET( MAYA_FOUND 1 CACHE STRING "Set to 1 if Maya is found, 0 otherwise")
-ELSE (MAYA_INCLUDE_PATH)
-	SET( MAYA_FOUND 0 CACHE STRING "Set to 1 if Maya is found, 0 otherwise")
-ENDIF (MAYA_INCLUDE_PATH)
-
-MARK_AS_ADVANCED( MAYA_FOUND )

cmake/FindOpenEXR.cmake

@@ -1,79 +0,0 @@
-#
-# Try to find OpenEXR's libraries, and include path.
-# Once done this will define:
-#
-# OPENEXR_FOUND = OpenEXR found. 
-# OPENEXR_INCLUDE_PATHS = OpenEXR include directories.
-# OPENEXR_LIBRARIES = libraries that are needed to use OpenEXR.
-# 
-
-INCLUDE(FindZLIB)
-
-
-IF(ZLIB_FOUND)
-
-	SET(LIBRARY_PATHS 
-		/usr/lib
-		/usr/local/lib
-		/sw/lib
-		/opt/local/lib
-		$ENV{PROGRAM_FILES}/OpenEXR/lib/static)
-
-	FIND_PATH(OPENEXR_INCLUDE_PATH ImfRgbaFile.h
-		PATH_SUFFIXES OpenEXR
-		/usr/include
-		/usr/local/include
-		/sw/include
-		/opt/local/include)
-
-	FIND_LIBRARY(OPENEXR_HALF_LIBRARY 
-		NAMES Half
-		PATHS ${LIBRARY_PATHS})
-  
-	FIND_LIBRARY(OPENEXR_IEX_LIBRARY 
-		NAMES Iex
-		PATHS ${LIBRARY_PATHS})
- 
-	FIND_LIBRARY(OPENEXR_IMATH_LIBRARY
-		NAMES Imath
-		PATHS ${LIBRARY_PATHS})
-  
-	FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY
-		NAMES IlmImf
-		PATHS ${LIBRARY_PATHS})
-
-	FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY
-		NAMES IlmThread
-		PATHS ${LIBRARY_PATHS})
-
-ENDIF(ZLIB_FOUND)
-
-#MESSAGE(STATUS ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ZLIB_LIBRARY})
-
-IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
-	SET(OPENEXR_FOUND TRUE)
-	SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR")
-	SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${ZLIB_LIBRARY} CACHE STRING "The libraries needed to use OpenEXR")
-
-	IF(OPENEXR_ILMTHREAD_LIBRARY)
-		SET(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} ${OPENEXR_ILMTHREAD_LIBRARY})
-	ENDIF(OPENEXR_ILMTHREAD_LIBRARY)
-ENDIF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY)
-
-IF(OPENEXR_FOUND)
-	IF(NOT OPENEXR_FIND_QUIETLY)
-		MESSAGE(STATUS "Found OpenEXR: ${OPENEXR_ILMIMF_LIBRARY}")
-	ENDIF(NOT OPENEXR_FIND_QUIETLY)
-ELSE(OPENEXR_FOUND)
-	IF(OPENEXR_FIND_REQUIRED)
-		MESSAGE(FATAL_ERROR "Could not find OpenEXR library")
-	ENDIF(OPENEXR_FIND_REQUIRED)
-ENDIF(OPENEXR_FOUND)
-
-MARK_AS_ADVANCED(
-	OPENEXR_INCLUDE_PATHS
-	OPENEXR_LIBRARIES
-	OPENEXR_ILMIMF_LIBRARY
-	OPENEXR_IMATH_LIBRARY
-	OPENEXR_IEX_LIBRARY
-	OPENEXR_HALF_LIBRARY)

cmake/OptimalOptions.cmake

@@ -1,49 +1,11 @@
 
-INCLUDE(${NV_CMAKE_DIR}/DetermineProcessor.cmake)
-
 # Set optimal options for gcc:
-IF(CMAKE_COMPILER_IS_GNUCXX)
-
-	IF(NV_SYSTEM_PROCESSOR STREQUAL "i586")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i586")
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "i586")
-
-	IF(NV_SYSTEM_PROCESSOR STREQUAL "i686")
-		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=i686")
-		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse -mtune=i686 -msse3")
-		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=pentium4")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=prescott")
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "i686")
-
-	IF(NV_SYSTEM_PROCESSOR STREQUAL "x86_64")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=athlon64")
-		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=athlon64 -msse3")
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "x86_64")
-
-	IF(NV_SYSTEM_PROCESSOR STREQUAL "powerpc")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=powerpc -faltivec -maltivec -mabi=altivec -mpowerpc-gfxopt")
-		
-		# ibook G4:
-		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=7450 -mtune=7450 -faltivec -maltivec -mabi=altivec -mpowerpc-gfxopt")
-
-		# G5
-		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=G5 -faltivec -maltivec -mabi=altivec -mpowerpc-gfxopt")
-
-	ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "powerpc")
-
-#	IF(DARWIN)
-#		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")
-#		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")
-#	ENDIF(DARWIN)
-
-	IF(CMAKE_BUILD_TYPE STREQUAL "debug")
-		ADD_DEFINITIONS(-D_DEBUG)
-	ENDIF(CMAKE_BUILD_TYPE STREQUAL "debug")
-
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ENDIF()
 
 IF(MSVC)
-	# @@ Some of these might only be available in VC8.
 	# Code generation flags.
 #	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2 /fp:fast")
 #	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /fp:fast")

cmake/make2cmake.cmake

@@ -1,61 +0,0 @@
-
-#  For more information, please see: http://software.sci.utah.edu
-#
-#  The MIT License
-#
-#  Copyright (c) 2007
-#  Scientific Computing and Imaging Institute, University of Utah
-#
-#  License for the specific language governing rights and limitations under
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-#  and/or sell copies of the Software, and to permit persons to whom the
-#  Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included
-#  in all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-#  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-#  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-#  DEALINGS IN THE SOFTWARE.
-
-# Make2cmake CMake Script
-# Abe Stephens and James Bigler
-# (c) 2007 Scientific Computing and Imaging Institute, University of Utah
-# Note that the REGEX expressions may need to be tweaked for different dependency generators.
-
-file(READ ${input_file} depend_text)
-
-if (${depend_text} MATCHES ".+")
-
-  # message("FOUND DEPENDS")
-
-  # Remember, four backslashes is escaped to one backslash in the string.
-  string(REGEX REPLACE "\\\\ " " " depend_text ${depend_text})
-
-  # This works for the nvcc -M generated dependency files.
-  string(REGEX REPLACE "^.* : " "" depend_text ${depend_text})
-  string(REGEX REPLACE "[ \\\\]*\n" ";" depend_text ${depend_text})
-
-  foreach(file ${depend_text})
-
-    string(REGEX REPLACE "^ +" "" file ${file})
-
-    if(NOT IS_DIRECTORY ${file})
-      set(cuda_nvcc_depend "${cuda_nvcc_depend} \"${file}\"\n")
-    endif(NOT IS_DIRECTORY ${file})
-
-  endforeach(file)
-
-else()
-  # message("FOUND NO DEPENDS")
-endif()
-
-
-file(WRITE ${output_file} "# Generated by: make2cmake.cmake\nSET(CUDA_NVCC_DEPEND\n ${cuda_nvcc_depend})\n\n")

cmake/parse_cubin.cmake

@@ -1,105 +0,0 @@
-#  For more information, please see: http://software.sci.utah.edu
-#
-#  The MIT License
-#
-#  Copyright (c) 2007
-#  Scientific Computing and Imaging Institute, University of Utah
-#
-#  License for the specific language governing rights and limitations under
-#  Permission is hereby granted, free of charge, to any person obtaining a
-#  copy of this software and associated documentation files (the "Software"),
-#  to deal in the Software without restriction, including without limitation
-#  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-#  and/or sell copies of the Software, and to permit persons to whom the
-#  Software is furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included
-#  in all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-#  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-#  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-#  DEALINGS IN THE SOFTWARE.
-
-# .cubin Parsing CMake Script
-# Abe Stephens
-# (c) 2007 Scientific Computing and Imaging Institute, University of Utah
-
-file(READ ${input_file} file_text)
-
-if (${file_text} MATCHES ".+")
-
-  # Remember, four backslashes is escaped to one backslash in the string.
-  string(REGEX REPLACE ";" "\\\\;" file_text ${file_text})
-  string(REGEX REPLACE "\ncode" ";code" file_text ${file_text})
-
-  list(LENGTH file_text len)
-
-  foreach(line ${file_text})
-
-    # Only look at "code { }" blocks.
-    if(line MATCHES "^code")
-
-      # Break into individual lines.
-      string(REGEX REPLACE "\n" ";" line ${line})
-
-      foreach(entry ${line})
-
-        # Extract kernel names.
-        if (${entry} MATCHES "[^g]name = ([^ ]+)")
-          string(REGEX REPLACE ".* = ([^ ]+)" "\\1" entry ${entry})
-
-          # Check to see if the kernel name starts with "_"
-          set(skip FALSE)
-          # if (${entry} MATCHES "^_")
-            # Skip the rest of this block.
-            # message("Skipping ${entry}")
-            # set(skip TRUE)
-          # else (${entry} MATCHES "^_")
-            message("Kernel:    ${entry}")
-          # endif (${entry} MATCHES "^_")
-
-        endif(${entry} MATCHES "[^g]name = ([^ ]+)")
-
-        # Skip the rest of the block if necessary
-        if(NOT skip)
-
-          # Registers
-          if (${entry} MATCHES "reg = ([^ ]+)")
-            string(REGEX REPLACE ".* = ([^ ]+)" "\\1" entry ${entry})
-            message("Registers: ${entry}")
-          endif(${entry} MATCHES "reg = ([^ ]+)")
-
-          # Local memory
-          if (${entry} MATCHES "lmem = ([^ ]+)")
-            string(REGEX REPLACE ".* = ([^ ]+)" "\\1" entry ${entry})
-            message("Local:     ${entry}")
-          endif(${entry} MATCHES "lmem = ([^ ]+)")
-
-          # Shared memory
-          if (${entry} MATCHES "smem = ([^ ]+)")
-            string(REGEX REPLACE ".* = ([^ ]+)" "\\1" entry ${entry})
-            message("Shared:    ${entry}")
-          endif(${entry} MATCHES "smem = ([^ ]+)")
-
-          if (${entry} MATCHES "^}")
-            message("")
-          endif(${entry} MATCHES "^}")
-
-        endif(NOT skip)
-
-
-      endforeach(entry)
-
-    endif(line MATCHES "^code")
-
-  endforeach(line)
-
-else()
-  # message("FOUND NO DEPENDS")
-endif()
-
-

cmake/run_nvcc.cmake

@@ -1,227 +0,0 @@
-# This file runs the nvcc commands to produce the desired output file along with
-# the dependency file needed by CMake to compute dependencies.  In addition the
-# file checks the output of each command and if the command fails it deletes the
-# output files.
-
-# Input variables
-#
-# verbose:BOOL=<>          OFF: Be as quiet as possible (default)
-#                          ON : Describe each step
-#
-# build_configuration:STRING=<> Typically one of Debug, MinSizeRel, Release, or
-#                               RelWithDebInfo, but it should match one of the
-#                               entries in CUDA_HOST_FLAGS. This is the build
-#                               configuration used when compiling the code.  If
-#                               blank or unspecified Debug is assumed as this is
-#                               what CMake does.
-#
-# generated_file:STRING=<> File to generate.  This argument must be passed in.
-#
-# generated_cubin_file:STRING=<> File to generate.  This argument must be passed
-#                                                   in if build_cubin is true.
-
-if(NOT generated_file)
-  message(FATAL_ERROR "You must specify generated_file on the command line")
-endif()
-
-# Set these up as variables to make reading the generated file easier
-set(CMAKE_COMMAND "@CMAKE_COMMAND@")
-set(source_file "@source_file@")
-set(NVCC_generated_dependency_file "@NVCC_generated_dependency_file@")
-set(cmake_dependency_file "@cmake_dependency_file@")
-set(CUDA_make2cmake "@CUDA_make2cmake@")
-set(CUDA_parse_cubin "@CUDA_parse_cubin@")
-set(build_cubin @build_cubin@)
-# We won't actually use these variables for now, but we need to set this, in
-# order to force this file to be run again if it changes.
-set(generated_file_path "@generated_file_path@")
-set(generated_file_internal "@generated_file@")
-set(generated_cubin_file_internal "@generated_cubin_file@")
-
-set(CUDA_NVCC_EXECUTABLE "@CUDA_NVCC_EXECUTABLE@")
-set(CUDA_NVCC_FLAGS "@CUDA_NVCC_FLAGS@;@CUDA_WRAP_OPTION_NVCC_FLAGS@")
-@CUDA_NVCC_FLAGS_CONFIG@
-set(nvcc_flags "@nvcc_flags@")
-set(CUDA_NVCC_INCLUDE_ARGS "@CUDA_NVCC_INCLUDE_ARGS@")
-set(format_flag "@format_flag@")
-
-if(build_cubin AND NOT generated_cubin_file)
-  message(FATAL_ERROR "You must specify generated_cubin_file on the command line")
-endif()
-
-# This is the list of host compilation flags.  It C or CXX should already have
-# been chosen by FindCUDA.cmake.
-@CUDA_HOST_FLAGS@
-
-# Take the compiler flags and package them up to be sent to the compiler via -Xcompiler
-set(nvcc_host_compiler_flags "")
-# If we weren't given a build_configuration, use Debug.
-if(NOT build_configuration)
-  set(build_configuration Debug)
-endif()
-string(TOUPPER "${build_configuration}" build_configuration)
-#message("CUDA_NVCC_HOST_COMPILER_FLAGS = ${CUDA_NVCC_HOST_COMPILER_FLAGS}")
-foreach(flag ${CMAKE_HOST_FLAGS} ${CMAKE_HOST_FLAGS_${build_configuration}})
-  # Extra quotes are added around each flag to help nvcc parse out flags with spaces.
-  set(nvcc_host_compiler_flags "${nvcc_host_compiler_flags},\"${flag}\"")
-endforeach()
-if (nvcc_host_compiler_flags)
-  set(nvcc_host_compiler_flags "-Xcompiler" ${nvcc_host_compiler_flags})
-endif()
-#message("nvcc_host_compiler_flags = \"${nvcc_host_compiler_flags}\"")
-# Add the build specific configuration flags
-list(APPEND CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS_${build_configuration}})
-
-if(DEFINED CCBIN)
-  set(CCBIN -ccbin "${CCBIN}")
-endif()
-
-# cuda_execute_process - Executes a command with optional command echo and status message.
-#
-#   status  - Status message to print if verbose is true
-#   command - COMMAND argument from the usual execute_process argument structure
-#   ARGN    - Remaining arguments are the command with arguments
-#
-#   CUDA_result - return value from running the command
-#
-# Make this a macro instead of a function, so that things like RESULT_VARIABLE
-# and other return variables are present after executing the process.
-macro(cuda_execute_process status command)
-  set(_command ${command})
-  if(NOT _command STREQUAL "COMMAND")
-    message(FATAL_ERROR "Malformed call to cuda_execute_process.  Missing COMMAND as second argument. (command = ${command})")
-  endif()
-  if(verbose)
-    execute_process(COMMAND "${CMAKE_COMMAND}" -E echo -- ${status})
-    # Now we need to build up our command string.  We are accounting for quotes
-    # and spaces, anything else is left up to the user to fix if they want to
-    # copy and paste a runnable command line.
-    set(cuda_execute_process_string)
-    foreach(arg ${ARGN})
-      # If there are quotes, excape them, so they come through.
-      string(REPLACE "\"" "\\\"" arg ${arg})
-      # Args with spaces need quotes around them to get them to be parsed as a single argument.
-      if(arg MATCHES " ")
-        list(APPEND cuda_execute_process_string "\"${arg}\"")
-      else()
-        list(APPEND cuda_execute_process_string ${arg})
-      endif()
-    endforeach()
-    # Echo the command
-    execute_process(COMMAND ${CMAKE_COMMAND} -E echo ${cuda_execute_process_string})
-  endif(verbose)
-  # Run the command
-  execute_process(COMMAND ${ARGN} RESULT_VARIABLE CUDA_result )
-endmacro()
-
-# Delete the target file
-cuda_execute_process(
-  "Removing ${generated_file}"
-  COMMAND "${CMAKE_COMMAND}" -E remove "${generated_file}"
-  )
-
-# Generate the dependency file
-cuda_execute_process(
-  "Generating dependency file: ${NVCC_generated_dependency_file}"
-  COMMAND "${CUDA_NVCC_EXECUTABLE}"
-  "${source_file}"
-  ${CUDA_NVCC_FLAGS}
-  ${nvcc_flags}
-  ${CCBIN}
-  ${nvcc_host_compiler_flags}
-  -DNVCC
-  -M
-  -o "${NVCC_generated_dependency_file}"
-  ${CUDA_NVCC_INCLUDE_ARGS}
-  )
-
-if(CUDA_result)
-  message(FATAL_ERROR "Error generating ${generated_file}")
-endif()
-
-# Generate the cmake readable dependency file to a temp file.  Don't put the
-# quotes just around the filenames for the input_file and output_file variables.
-# CMake will pass the quotes through and not be able to find the file.
-cuda_execute_process(
-  "Generating temporary cmake readable file: ${cmake_dependency_file}.tmp"
-  COMMAND "${CMAKE_COMMAND}"
-  -D "input_file:FILEPATH=${NVCC_generated_dependency_file}"
-  -D "output_file:FILEPATH=${cmake_dependency_file}.tmp"
-  -P "${CUDA_make2cmake}"
-  )
-
-if(CUDA_result)
-  message(FATAL_ERROR "Error generating ${generated_file}")
-endif()
-
-# Copy the file if it is different
-cuda_execute_process(
-  "Copy if different ${cmake_dependency_file}.tmp to ${cmake_dependency_file}"
-  COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${cmake_dependency_file}.tmp" "${cmake_dependency_file}"
-  )
-
-if(CUDA_result)
-  message(FATAL_ERROR "Error generating ${generated_file}")
-endif()
-
-# Delete the temporary file
-cuda_execute_process(
-  "Removing ${cmake_dependency_file}.tmp and ${NVCC_generated_dependency_file}"
-  COMMAND "${CMAKE_COMMAND}" -E remove "${cmake_dependency_file}.tmp" "${NVCC_generated_dependency_file}"
-  )
-
-if(CUDA_result)
-  message(FATAL_ERROR "Error generating ${generated_file}")
-endif()
-
-# Generate the code
-cuda_execute_process(
-  "Generating ${generated_file}"
-  COMMAND "${CUDA_NVCC_EXECUTABLE}"
-  "${source_file}"
-  ${CUDA_NVCC_FLAGS}
-  ${nvcc_flags}
-  ${CCBIN}
-  ${nvcc_host_compiler_flags}
-  -DNVCC
-  ${format_flag} -o "${generated_file}"
-  ${CUDA_NVCC_INCLUDE_ARGS}
-  )
-
-if(CUDA_result)
-  # Since nvcc can sometimes leave half done files make sure that we delete the output file.
-  cuda_execute_process(
-    "Removing ${generated_file}"
-    COMMAND "${CMAKE_COMMAND}" -E remove "${generated_file}"
-    )
-  message(FATAL_ERROR "Error generating file ${generated_file}")
-else()
-  message("Generated ${generated_file} successfully.")
-endif()
-
-# Cubin resource report commands.
-if( build_cubin )
-  # Run with -cubin to produce resource usage report.
-  cuda_execute_process(
-    "Generating ${generated_cubin_file}"
-    COMMAND "${CUDA_NVCC_EXECUTABLE}"
-    "${source_file}"
-    ${CUDA_NVCC_FLAGS}
-    ${nvcc_flags}
-    ${CCBIN}
-    ${nvcc_host_compiler_flags}
-    -DNVCC
-    -cubin
-    -o "${generated_cubin_file}"
-    ${CUDA_NVCC_INCLUDE_ARGS}
-    )
-
-  # Execute the parser script.
-  cuda_execute_process(
-    "Executing the parser script"
-    COMMAND  "${CMAKE_COMMAND}"
-    -D "input_file:STRING=${generated_cubin_file}"
-    -P "${CUDA_parse_cubin}"
-    )
-
-endif( build_cubin )

configure

@@ -18,7 +18,7 @@ fi
 
 
 help=false
-build="Debug"	# release
+build="debug"	# release
 prefix=/usr/local
 
 # Parse the args
@@ -26,9 +26,8 @@ for i in "$@"
 do
 	case $i in
 		--help )				help=true ;;
-		--debug )				build="Debug" ;;
-		--release )				build="Release" ;;
-		--prefix=* )			prefix="${i#--prefix=}" ;;
+		--debug )				build="debug" ;;
+		--release )				build="release" ;;
 		--prefix=* )			prefix="${i#--prefix=}" ;;
 		* )						echo "Unrecognised argument $i" ;;
 	esac
@@ -53,7 +52,7 @@ echo "-- Configuring nvidia-texture-tools "`cat VERSION`
 
 mkdir -p ./build-$build
 cd ./build-$build
-$CMAKE .. -DNVTT_SHARED=1 -DCMAKE_BUILD_TYPE=$build -DCMAKE_INSTALL_PREFIX=$prefix -G "Unix Makefiles" || exit 1
+$CMAKE .. -DNVTT_SHARED=0 -DCMAKE_BUILD_TYPE=$build -DCMAKE_INSTALL_PREFIX=$prefix -G "Unix Makefiles" || exit 1
 cd ..
 
 echo ""
@@ -62,15 +61,15 @@ echo ""
 
 cat > Makefile << EOF
 all:
-	@make --no-print-directory -C build-$build/
+	@+make --no-print-directory -C build-$build/
 install:
-	@make install --no-print-directory -C build-$build/
+	@+make install --no-print-directory -C build-$build/
 package:
-	@make package --no-print-directory -C build-$build/
+	@+make package --no-print-directory -C build-$build/
 test:
-	@make test --no-print-directory -C build-$build/
+	@+make test --no-print-directory -C build-$build/
 clean:
-	@make clean --no-print-directory -C build-$build/
+	@+make clean --no-print-directory -C build-$build/
 distclean:
 	@rm -Rf build-$build/
 EOF