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

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