From 9d93fccb3734705542c73ec6c34758a2b751eeb2 Mon Sep 17 00:00:00 2001 From: Ignacio Date: Sun, 23 Aug 2020 15:20:42 -0700 Subject: [PATCH] Cleanup. --- CMakeLists.txt | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc38f7c..1c3debc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,19 +16,6 @@ else() message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.") endif() -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) - INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake) MESSAGE(STATUS "Setting optimal options") MESSAGE(STATUS " Processor: ${NV_SYSTEM_PROCESSOR}") @@ -40,12 +27,6 @@ IF(CMAKE_BUILD_TYPE MATCHES "debug") ENDIF() -#IF(NVTT_SHARED) -# SET(NVCORE_SHARED TRUE) -# SET(NVMATH_SHARED TRUE) -# SET(NVIMAGE_SHARED TRUE) -#ENDIF(NVTT_SHARED) - ADD_SUBDIRECTORY(extern) ADD_SUBDIRECTORY(src) @@ -66,10 +47,9 @@ 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_VERSION_PATCH "1") +SET(CPACK_PACKAGE_VERSION "2.1.1") SET(CPACK_PACKAGE_CONTACT "Ignacio Castaņo ") -#SET(CPACK_PACKAGE_VENDOR "NVIDIA Corporation") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Texture processing tools with support for Direct3D 10 and 11 formats.") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${NV_SOURCE_DIR}/README.md") @@ -79,7 +59,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${NV_SOURCE_DIR}/LICENSE") 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)