drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cmake build in msvc. Fixes issue 111.

Browse Source
This commit is contained in:
castano
2010-03-18 00:13:31 +00:00
parent f436a71479
commit 447634d263
3 changed files with 80 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/nvcore/CMakeLists.txt
View File

@ -1,25 +1,25 @@
PROJECT(nvcore) PROJECT(nvcore)
SET(CORE_SRCS SET(CORE_SRCS
nvcore.h nvcore.h
Algorithms.h Algorithms.h
Containers.h Containers.h
Debug.h Debug.cpp Debug.h Debug.cpp
DefsGnucDarwin.h DefsGnucDarwin.h
DefsGnucLinux.h DefsGnucLinux.h
DefsGnucWin32.h DefsGnucWin32.h
DefsVcWin32.h DefsVcWin32.h
FileSystem.h FileSystem.cpp FileSystem.h FileSystem.cpp
Library.h Library.cpp Library.h Library.cpp
Memory.h Memory.cpp Memory.h Memory.cpp
Ptr.h Ptr.h
RefCounted.h RefCounted.cpp RefCounted.h RefCounted.cpp
StrLib.h StrLib.cpp StrLib.h StrLib.cpp
Stream.h Stream.h
StdStream.h StdStream.h
TextReader.h TextReader.cpp TextReader.h TextReader.cpp
TextWriter.h TextWriter.cpp TextWriter.h TextWriter.cpp
Timer.h) Timer.h)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@ -27,18 +27,19 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_DEFINITIONS(-DNVCORE_EXPORTS) ADD_DEFINITIONS(-DNVCORE_EXPORTS)
IF(UNIX) IF(UNIX)
SET(LIBS ${LIBS} ${CMAKE_DL_LIBS}) SET(LIBS ${LIBS} ${CMAKE_DL_LIBS})
ENDIF(UNIX) ENDIF(UNIX)
IF(NVCORE_SHARED) IF(NVCORE_SHARED)
ADD_LIBRARY(nvcore SHARED ${CORE_SRCS}) ADD_DEFINITIONS(-DNVCORE_SHARED=1)
ADD_LIBRARY(nvcore SHARED ${CORE_SRCS})
ELSE(NVCORE_SHARED) ELSE(NVCORE_SHARED)
ADD_LIBRARY(nvcore ${CORE_SRCS}) ADD_LIBRARY(nvcore ${CORE_SRCS})
ENDIF(NVCORE_SHARED) ENDIF(NVCORE_SHARED)
TARGET_LINK_LIBRARIES(nvcore ${LIBS}) TARGET_LINK_LIBRARIES(nvcore ${LIBS})
INSTALL(TARGETS nvcore INSTALL(TARGETS nvcore
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static) ARCHIVE DESTINATION lib/static)

79
src/nvimage/CMakeLists.txt
View File

@ -1,70 +1,71 @@
PROJECT(nvimage) PROJECT(nvimage)
SET(IMAGE_SRCS SET(IMAGE_SRCS
nvimage.h nvimage.h
FloatImage.h FloatImage.h
FloatImage.cpp FloatImage.cpp
Filter.h Filter.h
Filter.cpp Filter.cpp
Image.h Image.h
Image.cpp Image.cpp
ImageIO.h ImageIO.h
ImageIO.cpp ImageIO.cpp
ColorBlock.h ColorBlock.h
ColorBlock.cpp ColorBlock.cpp
BlockDXT.h BlockDXT.h
BlockDXT.cpp BlockDXT.cpp
DirectDrawSurface.h DirectDrawSurface.h
DirectDrawSurface.cpp DirectDrawSurface.cpp
Quantize.h Quantize.h
Quantize.cpp Quantize.cpp
NormalMap.h NormalMap.h
NormalMap.cpp NormalMap.cpp
PsdFile.h PsdFile.h
TgaFile.h TgaFile.h
ColorSpace.h ColorSpace.h
ColorSpace.cpp) ColorSpace.cpp)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
IF(PNG_FOUND) IF(PNG_FOUND)
SET(LIBS ${LIBS} ${PNG_LIBRARIES}) SET(LIBS ${LIBS} ${PNG_LIBRARIES})
INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
ENDIF(PNG_FOUND) ENDIF(PNG_FOUND)
IF(JPEG_FOUND) IF(JPEG_FOUND)
SET(LIBS ${LIBS} ${JPEG_LIBRARIES}) SET(LIBS ${LIBS} ${JPEG_LIBRARIES})
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
ENDIF(JPEG_FOUND) ENDIF(JPEG_FOUND)
IF(TIFF_FOUND) IF(TIFF_FOUND)
SET(LIBS ${LIBS} ${TIFF_LIBRARIES}) SET(LIBS ${LIBS} ${TIFF_LIBRARIES})
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
ENDIF(TIFF_FOUND) ENDIF(TIFF_FOUND)
IF(OPENEXR_FOUND) IF(OPENEXR_FOUND)
SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES}) SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES})
INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS}) INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_PATHS})
ENDIF(OPENEXR_FOUND) ENDIF(OPENEXR_FOUND)
IF(FREEIMAGE_FOUND) IF(FREEIMAGE_FOUND)
SET(LIBS ${LIBS} ${FREEIMAGE_LIBRARIES}) SET(LIBS ${LIBS} ${FREEIMAGE_LIBRARIES})
INCLUDE_DIRECTORIES(${FREEIMAGE_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${FREEIMAGE_INCLUDE_PATH})
ENDIF(FREEIMAGE_FOUND) ENDIF(FREEIMAGE_FOUND)
# targets # targets
ADD_DEFINITIONS(-DNVIMAGE_EXPORTS) ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)
IF(NVIMAGE_SHARED) IF(NVIMAGE_SHARED)
ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS}) ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
ELSE(NVIMAGE_SHARED) ELSE(NVIMAGE_SHARED)
ADD_LIBRARY(nvimage ${IMAGE_SRCS}) ADD_LIBRARY(nvimage ${IMAGE_SRCS})
ENDIF(NVIMAGE_SHARED) ENDIF(NVIMAGE_SHARED)
TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh) TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh)
INSTALL(TARGETS nvimage INSTALL(TARGETS nvimage
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static) ARCHIVE DESTINATION lib/static)

27
src/nvmath/CMakeLists.txt
View File

@ -1,14 +1,14 @@
PROJECT(nvmath) PROJECT(nvmath)
SET(MATH_SRCS SET(MATH_SRCS
nvmath.h nvmath.h
Vector.h Vector.h
Matrix.h Matrix.h
Plane.h Plane.cpp Plane.h Plane.cpp
Box.h Box.h
Color.h Color.h
Half.h Half.cpp Half.h Half.cpp
Fitting.h Fitting.cpp) Fitting.h Fitting.cpp)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@ -16,14 +16,15 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
ADD_DEFINITIONS(-DNVMATH_EXPORTS) ADD_DEFINITIONS(-DNVMATH_EXPORTS)
IF(NVMATH_SHARED) IF(NVMATH_SHARED)
ADD_LIBRARY(nvmath SHARED ${MATH_SRCS}) ADD_DEFINITIONS(-DNVMATH_SHARED=1)
ADD_LIBRARY(nvmath SHARED ${MATH_SRCS})
ELSE(NVMATH_SHARED) ELSE(NVMATH_SHARED)
ADD_LIBRARY(nvmath ${MATH_SRCS}) ADD_LIBRARY(nvmath ${MATH_SRCS})
ENDIF(NVMATH_SHARED) ENDIF(NVMATH_SHARED)
TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore) TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)
INSTALL(TARGETS nvmath INSTALL(TARGETS nvmath
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static) ARCHIVE DESTINATION lib/static)