From 7b4b7bb42e40c8ab881ccb1e07cf8d56c3d428a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Fri, 2 Feb 2018 19:45:18 +0100 Subject: [PATCH 1/3] Build intermediate EtcLib always as STATIC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Depending on the BUILD_SHARED_LIBS variable EtcLib may be built as SHARED if not set explicitly, like done for the other libraries in extern. Signed-off-by: Stefan Brüns --- extern/EtcLib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/EtcLib/CMakeLists.txt b/extern/EtcLib/CMakeLists.txt index b584b88..044b92b 100644 --- a/extern/EtcLib/CMakeLists.txt +++ b/extern/EtcLib/CMakeLists.txt @@ -21,4 +21,4 @@ file(GLOB SOURCES ${PROJECT_SOURCE_DIR}/EtcCodec/*.h ${PROJECT_SOURCE_DIR}/Etc/*.cpp ${PROJECT_SOURCE_DIR}/EtcCodec/*.cpp) -ADD_LIBRARY(EtcLib ${SOURCES}) +ADD_LIBRARY(EtcLib STATIC ${SOURCES}) From 389f7582e58e917e3d8533381fed22d9adb14afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Fri, 2 Feb 2018 03:42:25 +0100 Subject: [PATCH 2/3] Fix linking of bc7, needs symbols from nvmath If nvtt is build with -Wl,--as-needed, the linker will not resolve bc7 symbols from any library listed earlier, make sure it (also) appears after libbc7.a --- src/bc7/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bc7/CMakeLists.txt b/src/bc7/CMakeLists.txt index 2eb01c0..ab952f0 100644 --- a/src/bc7/CMakeLists.txt +++ b/src/bc7/CMakeLists.txt @@ -23,6 +23,8 @@ SET(BC7_SRCS ADD_LIBRARY(bc7 STATIC ${BC7_SRCS}) +TARGET_LINK_LIBRARIES(bc7 nvmath) + IF(NOT WIN32) IF(CMAKE_COMPILER_IS_GNUCXX) SET_TARGET_PROPERTIES(bc7 PROPERTIES COMPILE_FLAGS -fPIC) From 00d7e249e26000d2ac5e554a0aae9b6df76915ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Fri, 2 Feb 2018 03:58:23 +0100 Subject: [PATCH 3/3] Add nvimgdiff to TOOLS target, so it is installed by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Brüns --- src/nvtt/tools/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvtt/tools/CMakeLists.txt b/src/nvtt/tools/CMakeLists.txt index 5459bd1..6161a43 100644 --- a/src/nvtt/tools/CMakeLists.txt +++ b/src/nvtt/tools/CMakeLists.txt @@ -17,7 +17,7 @@ TARGET_LINK_LIBRARIES(nvassemble nvcore nvimage nvtt bc6h nvmath) ADD_EXECUTABLE(nvzoom resize.cpp cmdline.h) TARGET_LINK_LIBRARIES(nvzoom nvcore nvimage nvtt bc6h nvmath) -SET(TOOLS nvcompress nvdecompress nvddsinfo nvassemble nvzoom) +SET(TOOLS nvcompress nvdecompress nvddsinfo nvimgdiff nvassemble nvzoom) IF(GLEW_FOUND AND GLUT_FOUND AND OPENGL_FOUND) INCLUDE_DIRECTORIES(${GLEW_INCLUDE_PATH} ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})