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