Skip to content
This repository has been archived by the owner on Dec 31, 2020. It is now read-only.

Improved CMake build #234

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Improved CMake build #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c02e25
Removed FindCUDA cmake modules (CMake is shipped with an always up-to…
magestik Jan 18, 2016
6eefc53
Updated CMakeLists to compile squish/posh/bc6h/bc7 as OBJECT library …
magestik Jan 18, 2016
66b6d02
export cmake targets
magestik Jan 18, 2016
3880e63
updated CMake minimum version
magestik Jan 18, 2016
5f392e6
removed unwanted header installation (CMake)
magestik Jan 19, 2016
e6f76af
fixed indentation to follow nvtt guidelines
magestik Feb 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
PROJECT(NV)
ENABLE_TESTING()

Expand Down
1,123 changes: 0 additions & 1,123 deletions cmake/FindCUDA.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion extern/poshlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SET(POSHLIB_SRCS
posh.c
posh.h)

ADD_LIBRARY(posh STATIC ${POSHLIB_SRCS})
ADD_LIBRARY(posh OBJECT ${POSHLIB_SRCS})

2 changes: 1 addition & 1 deletion src/bc6h/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SET(BC6H_SRCS
zohone.cpp
zohtwo.cpp)

ADD_LIBRARY(bc6h STATIC ${BC6H_SRCS})
ADD_LIBRARY(bc6h OBJECT ${BC6H_SRCS})

IF(NOT WIN32)
IF(CMAKE_COMPILER_IS_GNUCXX)
Expand Down
2 changes: 1 addition & 1 deletion src/bc7/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ SET(BC7_SRCS
avpcl_utils.cpp
avpcl_utils.h)

ADD_LIBRARY(bc7 STATIC ${BC7_SRCS})
ADD_LIBRARY(bc7 OBJECT ${BC7_SRCS})

IF(NOT WIN32)
IF(CMAKE_COMPILER_IS_GNUCXX)
Expand Down
5 changes: 3 additions & 2 deletions src/nvcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SET(CORE_SRCS
DefsVcWin32.h
FileSystem.h FileSystem.cpp
ForEach.h
Library.h Library.cpp
Memory.h Memory.cpp
Ptr.h
RefCounted.h
Expand Down Expand Up @@ -38,9 +39,9 @@ ENDIF(NVCORE_SHARED)

TARGET_LINK_LIBRARIES(nvcore ${LIBS})

INSTALL(TARGETS nvcore
INSTALL(TARGETS nvcore EXPORT nvcore-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)

INSTALL(EXPORT nvcore-targets DESTINATION share/cmake)

11 changes: 6 additions & 5 deletions src/nvimage/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PROJECT(nvimage)

SET(IMAGE_SRCS
SET(IMAGE_SRCS
nvimage.h
BlockDXT.h BlockDXT.cpp
ColorBlock.h ColorBlock.cpp
Expand Down Expand Up @@ -48,15 +48,16 @@ ADD_DEFINITIONS(-DNVIMAGE_EXPORTS)

IF(NVIMAGE_SHARED)
ADD_DEFINITIONS(-DNVIMAGE_SHARED=1)
ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS})
ADD_LIBRARY(nvimage SHARED ${IMAGE_SRCS} $<TARGET_OBJECTS:posh> $<TARGET_OBJECTS:bc6h> $<TARGET_OBJECTS:bc7>)
ELSE(NVIMAGE_SHARED)
ADD_LIBRARY(nvimage ${IMAGE_SRCS})
ADD_LIBRARY(nvimage ${IMAGE_SRCS} $<TARGET_OBJECTS:posh> $<TARGET_OBJECTS:bc6h> $<TARGET_OBJECTS:bc7>)
ENDIF(NVIMAGE_SHARED)

TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore posh bc6h bc7 nvmath)
TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath)

INSTALL(TARGETS nvimage
INSTALL(TARGETS nvimage EXPORT nvimage-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
INSTALL(EXPORT nvimage-targets DESTINATION share/cmake)

9 changes: 5 additions & 4 deletions src/nvmath/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ ENDIF(NVMATH_SHARED)

TARGET_LINK_LIBRARIES(nvmath ${LIBS} nvcore)

INSTALL(TARGETS nvmath
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
INSTALL(TARGETS nvmath EXPORT nvmath-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
INSTALL(EXPORT nvmath-targets DESTINATION share/cmake)
3 changes: 2 additions & 1 deletion src/nvthread/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ ENDIF(NVTHREAD_SHARED)

TARGET_LINK_LIBRARIES(nvthread ${LIBS} nvcore)

INSTALL(TARGETS nvthread
INSTALL(TARGETS nvthread EXPORT nvthread-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
INSTALL(EXPORT nvthread-targets DESTINATION share/cmake)
14 changes: 9 additions & 5 deletions src/nvtt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,22 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

ADD_DEFINITIONS(-DNVTT_EXPORTS)

IF(NVTT_SHARED)
ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS})
IF(NVTT_SHARED)
ADD_LIBRARY(nvtt SHARED ${NVTT_SRCS} $<TARGET_OBJECTS:squish>)
ELSE(NVTT_SHARED)
ADD_LIBRARY(nvtt ${NVTT_SRCS})
ADD_LIBRARY(nvtt ${NVTT_SRCS} $<TARGET_OBJECTS:squish>)
ENDIF(NVTT_SHARED)

TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread squish bc6h bc7 nvmath)
TARGET_COMPILE_OPTIONS(nvtt PUBLIC ${OpenMP_CXX_FLAGS})

INSTALL(TARGETS nvtt
TARGET_LINK_LIBRARIES(nvtt ${LIBS} nvcore nvimage nvthread nvmath)

INSTALL(TARGETS nvtt EXPORT nvtt-targets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static)
INSTALL(EXPORT nvtt-targets DESTINATION share/cmake)


INSTALL(FILES nvtt.h DESTINATION include/nvtt)

Expand Down
3 changes: 1 addition & 2 deletions src/nvtt/squish/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SET(SQUISH_SRCS
simd_sse.h
simd_ve.h)

ADD_LIBRARY(squish STATIC ${SQUISH_SRCS})
ADD_LIBRARY(squish OBJECT ${SQUISH_SRCS})

IF(NOT WIN32)

Expand All @@ -32,4 +32,3 @@ IF(NOT WIN32)
SET_TARGET_PROPERTIES(squish PROPERTIES COMPILE_FLAGS -fPIC)
ENDIF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)
ENDIF(NOT WIN32)

2 changes: 1 addition & 1 deletion src/nvtt/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ADD_EXECUTABLE(cubemaptest cubemaptest.cpp)
TARGET_LINK_LIBRARIES(cubemaptest nvcore nvmath nvimage nvtt)

ADD_EXECUTABLE(nvhdrtest hdrtest.cpp)
TARGET_LINK_LIBRARIES(nvhdrtest nvcore nvimage nvtt bc6h nvmath)
TARGET_LINK_LIBRARIES(nvhdrtest nvcore nvimage nvtt nvmath)

INSTALL(TARGETS nvtestsuite nvhdrtest DESTINATION bin)

Expand Down
14 changes: 7 additions & 7 deletions src/nvtt/tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@

ADD_EXECUTABLE(nvcompress compress.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvcompress nvcore nvimage nvtt bc6h nvmath)
TARGET_LINK_LIBRARIES(nvcompress nvcore nvimage nvtt nvmath)

ADD_EXECUTABLE(nvdecompress decompress.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvdecompress nvcore nvimage nvtt bc6h nvmath)
TARGET_LINK_LIBRARIES(nvdecompress nvcore nvimage nvtt nvmath)

ADD_EXECUTABLE(nvddsinfo ddsinfo.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvddsinfo nvcore nvimage nvtt bc6h nvmath)
TARGET_LINK_LIBRARIES(nvddsinfo nvcore nvimage nvtt nvmath)

ADD_EXECUTABLE(nvimgdiff imgdiff.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvimgdiff nvcore nvtt bc6h nvmath)
TARGET_LINK_LIBRARIES(nvimgdiff nvcore nvtt nvmath)

ADD_EXECUTABLE(nvassemble assemble.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvassemble nvcore nvimage nvtt bc6h nvmath)
TARGET_LINK_LIBRARIES(nvassemble nvcore nvimage nvtt nvmath)

ADD_EXECUTABLE(nvzoom resize.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nvzoom nvcore nvimage nvtt bc6h nvmath)
TARGET_LINK_LIBRARIES(nvzoom nvcore nvimage nvtt nvmath)

SET(TOOLS nvcompress nvdecompress nvddsinfo nvassemble nvzoom)

Expand All @@ -28,7 +28,7 @@ ENDIF(GLEW_FOUND AND GLUT_FOUND AND OPENGL_FOUND)


ADD_EXECUTABLE(nv-gnome-thumbnailer thumbnailer.cpp cmdline.h)
TARGET_LINK_LIBRARIES(nv-gnome-thumbnailer nvcore nvtt nvimage bc6h nvmath)
TARGET_LINK_LIBRARIES(nv-gnome-thumbnailer nvcore nvtt nvimage nvmath)

SET(TOOLS ${TOOLS} nv-gnome-thumbnailer)

Expand Down