Pileus Git - ~andy/sunrise/blob - dev-util/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cmake.patch

   1 From: hasufell <julian.ospald@googlemail.com>
   2 Date: Wed Apr 11 21:49:58 UTC 2012
   3 Subject: various cmake fixes
   4
   5 fix hardcoded install paths for BINDIR and LIBDIR
   6 make cg, cuda, glew, glut and openexr controllable and not automagic
   7
   8 --- src/nvcore/CMakeLists.txt
   9 +++ src/nvcore/CMakeLists.txt
  10 @@ -42,6 +42,6 @@
  11  TARGET_LINK_LIBRARIES(nvcore ${LIBS})
  12
  13  INSTALL(TARGETS nvcore
  14 -       RUNTIME DESTINATION bin
  15 -       LIBRARY DESTINATION lib
  16 -       ARCHIVE DESTINATION lib/static)
  17 +       RUNTIME DESTINATION ${BINDIR}
  18 +       LIBRARY DESTINATION ${LIBDIR}
  19 +       ARCHIVE DESTINATION ${LIBDIR})
  20 --- src/nvimage/CMakeLists.txt
  21 +++ src/nvimage/CMakeLists.txt
  22 @@ -62,7 +62,7 @@
  23  TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh)
  24
  25  INSTALL(TARGETS nvimage
  26 -       RUNTIME DESTINATION bin
  27 -       LIBRARY DESTINATION lib
  28 -       ARCHIVE DESTINATION lib/static)
  29 +       RUNTIME DESTINATION ${BINDIR}
  30 +       LIBRARY DESTINATION ${LIBDIR}
  31 +       ARCHIVE DESTINATION ${LIBDIR})
  32
  33 --- src/nvmath/CMakeLists.txt
  34 +++ src/nvmath/CMakeLists.txt
  35 @@ -28,6 +28,6 @@
  36  TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
  37
  38  INSTALL(TARGETS nvmath
  39 -       RUNTIME DESTINATION bin
  40 -       LIBRARY DESTINATION lib
  41 -       ARCHIVE DESTINATION lib/static)
  42 +       RUNTIME DESTINATION ${BINDIR}
  43 +       LIBRARY DESTINATION ${LIBDIR}
  44 +       ARCHIVE DESTINATION ${LIBDIR})
  45 --- src/nvtt/CMakeLists.txt
  46 +++ src/nvtt/CMakeLists.txt
  47 @@ -53,9 +53,9 @@
  48  TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvmath nvimage squish)
  49
  50  INSTALL(TARGETS nvtt
  51 -       RUNTIME DESTINATION bin
  52 -       LIBRARY DESTINATION lib
  53 -       ARCHIVE DESTINATION lib/static)
  54 +       RUNTIME DESTINATION ${BINDIR}
  55 +       LIBRARY DESTINATION ${LIBDIR}
  56 +       ARCHIVE DESTINATION ${LIBDIR})
  57
  58  INSTALL(FILES nvtt.h DESTINATION include/nvtt)
  59
  60 --- src/CMakeLists.txt
  61 +++ src/CMakeLists.txt
  62 @@ -5,6 +5,13 @@
  63  SUBDIRS(nvtt)
  64
  65  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
  66 +
  67 +# initial variables
  68 +SET(GLUT TRUE CACHE BOOL "")
  69 +SET(GLEW TRUE CACHE BOOL "")
  70 +SET(CG TRUE CACHE BOOL "")
  71 +SET(CUDA TRUE CACHE BOOL "")
  72 +SET(OPENEXR TRUE CACHE BOOL "")
  73
  74  # OpenGL
  75  INCLUDE(FindOpenGL)
  76 @@ -15,13 +22,15 @@
  77  ENDIF(OPENGL_FOUND)
  78
  79  # GLUT
  80 -INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake)
  81 -#INCLUDE(FindGLUT)
  82 -IF(GLUT_FOUND)
  83 -       MESSAGE(STATUS "Looking for GLUT - found")
  84 -ELSE(GLUT_FOUND)
  85 -       MESSAGE(STATUS "Looking for GLUT - not found")
  86 -ENDIF(GLUT_FOUND)
  87 +IF(GLUT)
  88 +       INCLUDE(${NV_CMAKE_DIR}/FindGLUT.cmake)
  89 +       #INCLUDE(FindGLUT)
  90 +       IF(GLUT_FOUND)
  91 +               MESSAGE(STATUS "Looking for GLUT - found")
  92 +       ELSE(GLUT_FOUND)
  93 +               MESSAGE(STATUS "Looking for GLUT - not found")
  94 +       ENDIF(GLUT_FOUND)
  95 +ENDIF(GLUT)
  96
  97  # DirectX
  98  INCLUDE(${NV_CMAKE_DIR}/FindDirectX.cmake)
  99 @@ -32,29 +41,35 @@
 100  ENDIF(DX10_FOUND)
 101
 102  # GLEW
 103 -INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake)
 104 -IF(GLEW_FOUND)
 105 -       MESSAGE(STATUS "Looking for GLEW - found")
 106 -ELSE(GLEW_FOUND)
 107 -       MESSAGE(STATUS "Looking for GLEW - not found")
 108 -ENDIF(GLEW_FOUND)
 109 +IF(GLEW)
 110 +       INCLUDE(${NV_CMAKE_DIR}/FindGLEW.cmake)
 111 +       IF(GLEW_FOUND)
 112 +               MESSAGE(STATUS "Looking for GLEW - found")
 113 +       ELSE(GLEW_FOUND)
 114 +               MESSAGE(STATUS "Looking for GLEW - not found")
 115 +       ENDIF(GLEW_FOUND)
 116 +ENDIF(GLEW)
 117
 118  # Cg
 119 -INCLUDE(${NV_CMAKE_DIR}/FindCg.cmake)
 120 -IF(CG_FOUND)
 121 -       MESSAGE(STATUS "Looking for Cg - found")
 122 -ELSE(CG_FOUND)
 123 -       MESSAGE(STATUS "Looking for Cg - not found")
 124 -ENDIF(CG_FOUND)
 125 +IF(CG)
 126 +       INCLUDE(${NV_CMAKE_DIR}/FindCg.cmake)
 127 +       IF(CG_FOUND)
 128 +               MESSAGE(STATUS "Looking for Cg - found")
 129 +       ELSE(CG_FOUND)
 130 +               MESSAGE(STATUS "Looking for Cg - not found")
 131 +       ENDIF(CG_FOUND)
 132 +ENDIF(CG)
 133
 134  # CUDA
 135 -INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake)
 136 -IF(CUDA_FOUND)
 137 -       SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise")
 138 -       MESSAGE(STATUS "Looking for CUDA - found")
 139 -ELSE(CUDA_FOUND)
 140 -       MESSAGE(STATUS "Looking for CUDA - not found")
 141 -ENDIF(CUDA_FOUND)
 142 +IF(CUDA)
 143 +       INCLUDE(${NV_CMAKE_DIR}/FindCUDA.cmake)
 144 +       IF(CUDA_FOUND)
 145 +               SET(HAVE_CUDA ${CUDA_FOUND} CACHE BOOL "Set to TRUE if CUDA is found, FALSE otherwise")
 146 +               MESSAGE(STATUS "Looking for CUDA - found")
 147 +       ELSE(CUDA_FOUND)
 148 +               MESSAGE(STATUS "Looking for CUDA - not found")
 149 +       ENDIF(CUDA_FOUND)
 150 +ENDIF(CUDA)
 151
 152  # Maya
 153  INCLUDE(${NV_CMAKE_DIR}/FindMaya.cmake)
 154 @@ -93,13 +108,15 @@
 155  ENDIF(TIFF_FOUND)
 156
 157  # OpenEXR
 158 -INCLUDE(${NV_CMAKE_DIR}/FindOpenEXR.cmake)
 159 -IF(OPENEXR_FOUND)
 160 -       SET(HAVE_OPENEXR ${OPENEXR_FOUND} CACHE BOOL "Set to TRUE if OpenEXR is found, FALSE otherwise")
 161 -       MESSAGE(STATUS "Looking for OpenEXR - found")
 162 -ELSE(OPENEXR_FOUND)
 163 -       MESSAGE(STATUS "Looking for OpenEXR - not found")
 164 -ENDIF(OPENEXR_FOUND)
 165 +IF(OPENEXR)
 166 +       INCLUDE(${NV_CMAKE_DIR}/FindOpenEXR.cmake)
 167 +       IF(OPENEXR_FOUND)
 168 +               SET(HAVE_OPENEXR ${OPENEXR_FOUND} CACHE BOOL "Set to TRUE if OpenEXR is found, FALSE otherwise")
 169 +               MESSAGE(STATUS "Looking for OpenEXR - found")
 170 +       ELSE(OPENEXR_FOUND)
 171 +               MESSAGE(STATUS "Looking for OpenEXR - not found")
 172 +       ENDIF(OPENEXR_FOUND)
 173 +ENDIF(OPENEXR)
 174
 175  # Qt
 176  FIND_PACKAGE(Qt4)