From 5f5b40be91acad43c868350ac2aa38d147726f0c Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Thu, 8 Oct 2020 15:41:15 +0200 Subject: [PATCH 01/10] make ktx target includes and libs private --- CMakeLists.txt | 16 ++++++++-------- interface/basisu_c_binding/CMakeLists.txt | 2 +- tests/tests.cmake | 4 ++-- tests/transcodetests/CMakeLists.txt | 2 +- tools/ktx2check/CMakeLists.txt | 2 +- tools/ktx2ktx2/CMakeLists.txt | 2 +- tools/ktxinfo/CMakeLists.txt | 2 +- tools/ktxsc/CMakeLists.txt | 2 +- tools/toktx/CMakeLists.txt | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cd16a0c73..d7da791b54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,7 @@ target_include_directories( PUBLIC $ $ - +PRIVATE $ $ @@ -318,7 +318,7 @@ if(KTX_FEATURE_WRITE) PUBLIC $ $ - + PRIVATE $ $ ) @@ -329,7 +329,7 @@ set(KTX_BUILD_DIR "${CMAKE_BINARY_DIR}") if(WIN32) target_link_libraries( - ktx + ktx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/win/Release-x64/zstd_static.lib ) # By wrapping in generator expression we force multi configuration generators (like Visual Studio) @@ -339,7 +339,7 @@ if(WIN32) elseif(APPLE) if(IOS) target_link_libraries( - ktx + ktx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/ios/Release-iphoneos/libzstd.a ) else() @@ -348,7 +348,7 @@ elseif(APPLE) # for working code signing. set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$>) target_link_libraries( - ktx + ktx PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/mac/Release/libzstd.a ) endif() @@ -362,7 +362,7 @@ elseif(LINUX) find_package(zstd REQUIRED) find_package(Threads REQUIRED) target_link_libraries( - ktx + ktx PRIVATE dl Threads::Threads zstd::zstd @@ -380,7 +380,7 @@ elseif(ANDROID) set(ZSTD_BUILD_TESTS OFF) add_subdirectory(/Users/Shared/SDK/zstd/build/cmake zstd) target_link_libraries( - ktx + ktx PRIVATE libzstd_static ) endif() @@ -396,7 +396,7 @@ if(KTX_FEATURE_VULKAN) ) target_include_directories( ktx - PUBLIC + PRIVATE $ $ ) diff --git a/interface/basisu_c_binding/CMakeLists.txt b/interface/basisu_c_binding/CMakeLists.txt index e3e3d57909..85f95520ad 100644 --- a/interface/basisu_c_binding/CMakeLists.txt +++ b/interface/basisu_c_binding/CMakeLists.txt @@ -22,7 +22,7 @@ target_include_directories( PUBLIC inc PRIVATE - $ +$ ${PROJECT_SOURCE_DIR}/utils ) diff --git a/tests/tests.cmake b/tests/tests.cmake index 30edbf6b1f..5c194a3221 100644 --- a/tests/tests.cmake +++ b/tests/tests.cmake @@ -20,7 +20,7 @@ add_executable( unittests target_include_directories( unittests PRIVATE - $ + $ ${PROJECT_SOURCE_DIR}/lib ) @@ -39,7 +39,7 @@ add_executable( texturetests target_include_directories( texturetests PRIVATE - $ +$ ${PROJECT_SOURCE_DIR}/other_include ${PROJECT_SOURCE_DIR}/lib unittests diff --git a/tests/transcodetests/CMakeLists.txt b/tests/transcodetests/CMakeLists.txt index 0a5384233c..ab32a25a71 100644 --- a/tests/transcodetests/CMakeLists.txt +++ b/tests/transcodetests/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable( transcodetests target_include_directories( transcodetests PRIVATE - $ + $ $ ${CMAKE_CURRENT_SOURCE_DIR}/../../other_include ${CMAKE_CURRENT_SOURCE_DIR}/../../lib diff --git a/tools/ktx2check/CMakeLists.txt b/tools/ktx2check/CMakeLists.txt index 441684451a..13df3f2072 100644 --- a/tools/ktx2check/CMakeLists.txt +++ b/tools/ktx2check/CMakeLists.txt @@ -12,7 +12,7 @@ target_include_directories( ktx2check PRIVATE . - $ + $ $ ${PROJECT_SOURCE_DIR}/lib ${PROJECT_SOURCE_DIR}/other_include diff --git a/tools/ktx2ktx2/CMakeLists.txt b/tools/ktx2ktx2/CMakeLists.txt index cbd5f2ae72..78e34e3405 100644 --- a/tools/ktx2ktx2/CMakeLists.txt +++ b/tools/ktx2ktx2/CMakeLists.txt @@ -12,7 +12,7 @@ target_include_directories( ktx2ktx2 PRIVATE . - $ + $ $ ${PROJECT_SOURCE_DIR}/lib ${PROJECT_SOURCE_DIR}/other_include diff --git a/tools/ktxinfo/CMakeLists.txt b/tools/ktxinfo/CMakeLists.txt index 82f1d23fa9..b0ac8ed037 100644 --- a/tools/ktxinfo/CMakeLists.txt +++ b/tools/ktxinfo/CMakeLists.txt @@ -12,7 +12,7 @@ target_include_directories( ktxinfo PRIVATE . - $ + $ $ ${PROJECT_SOURCE_DIR}/lib ) diff --git a/tools/ktxsc/CMakeLists.txt b/tools/ktxsc/CMakeLists.txt index e60aaf4d38..e970821ddb 100644 --- a/tools/ktxsc/CMakeLists.txt +++ b/tools/ktxsc/CMakeLists.txt @@ -12,7 +12,7 @@ target_include_directories( ktxsc PRIVATE . - $ + $ $ ${PROJECT_SOURCE_DIR}/lib ${PROJECT_SOURCE_DIR}/other_include diff --git a/tools/toktx/CMakeLists.txt b/tools/toktx/CMakeLists.txt index d2191a29f4..3148d002af 100644 --- a/tools/toktx/CMakeLists.txt +++ b/tools/toktx/CMakeLists.txt @@ -18,7 +18,7 @@ target_include_directories( toktx PRIVATE . - $ + $ $ ${PROJECT_SOURCE_DIR}/lib ${PROJECT_SOURCE_DIR}/lib/basisu From 4875a853d60679281b0efb4150112a96a886351f Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Thu, 8 Oct 2020 16:43:21 +0200 Subject: [PATCH 02/10] fixed more INTERFACE_INCLUDE_DIRECTORIES --- CMakeLists.txt | 2 +- tests/loadtests/CMakeLists.txt | 2 +- tests/loadtests/glloadtests.cmake | 2 +- tests/loadtests/vkloadtests.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7da791b54..0fef631e77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,7 +425,7 @@ if(EMSCRIPTEN) add_executable( ktx_js interface/js_binding/ktx_wrapper.cpp ) target_link_libraries( ktx_js ktx ) - target_include_directories( ktx_js PRIVATE $ ) + target_include_directories( ktx_js PRIVATE $ ) target_link_options( ktx_js PUBLIC diff --git a/tests/loadtests/CMakeLists.txt b/tests/loadtests/CMakeLists.txt index 7bb8b19030..839cd80610 100644 --- a/tests/loadtests/CMakeLists.txt +++ b/tests/loadtests/CMakeLists.txt @@ -94,7 +94,7 @@ target_include_directories( PUBLIC ${SDL2_INCLUDE_DIRS} appfwSDL - $ + $ ${PROJECT_SOURCE_DIR}/lib ${PROJECT_SOURCE_DIR}/other_include ${PROJECT_SOURCE_DIR}/utils diff --git a/tests/loadtests/glloadtests.cmake b/tests/loadtests/glloadtests.cmake index b479883b9c..46f04e5f6a 100644 --- a/tests/loadtests/glloadtests.cmake +++ b/tests/loadtests/glloadtests.cmake @@ -16,7 +16,7 @@ function( create_gl_target target sources KTX_GL_CONTEXT_PROFILE KTX_GL_CONTEXT_ PRIVATE $ $ - $ + $ $ ) diff --git a/tests/loadtests/vkloadtests.cmake b/tests/loadtests/vkloadtests.cmake index 3d1fa0bfec..ed06b5cab4 100644 --- a/tests/loadtests/vkloadtests.cmake +++ b/tests/loadtests/vkloadtests.cmake @@ -110,7 +110,7 @@ target_include_directories( PRIVATE ${SDL2_INCLUDE_DIRS} $ - $ + $ $ appfwSDL/VulkanAppSDL vkloadtests From 4f903cdf645297d577f6dbb0cb03fecced0838f6 Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Thu, 8 Oct 2020 17:26:10 +0200 Subject: [PATCH 03/10] only zstd private linux library dependency --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fef631e77..ec535b1a5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,9 +362,10 @@ elseif(LINUX) find_package(zstd REQUIRED) find_package(Threads REQUIRED) target_link_libraries( - ktx PRIVATE + ktx dl Threads::Threads + PRIVATE zstd::zstd ) elseif(ANDROID) From e9154769b651187b0ca538fed641c9c8b50eee34 Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Thu, 8 Oct 2020 17:34:56 +0200 Subject: [PATCH 04/10] fixed cmake syntax --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec535b1a5d..8f3bdd0ce0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -363,8 +363,12 @@ elseif(LINUX) find_package(Threads REQUIRED) target_link_libraries( ktx + PUBLIC dl Threads::Threads + ) + target_link_libraries( + ktx PRIVATE zstd::zstd ) From c68ee1dd8d4add4772c1449c08e7545637b7d3e5 Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Fri, 9 Oct 2020 09:26:11 +0200 Subject: [PATCH 05/10] moved Threads::Threads to private dependencies --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f3bdd0ce0..5eebabe914 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,11 +365,11 @@ elseif(LINUX) ktx PUBLIC dl - Threads::Threads ) target_link_libraries( ktx PRIVATE + Threads::Threads zstd::zstd ) elseif(ANDROID) From 255e4f27de82c575195db7b56b1005b1b2df15f3 Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Mon, 16 Nov 2020 11:08:08 +0100 Subject: [PATCH 06/10] private include and library dependencies --- CMakeLists.txt | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de38d5fe91..d667271294 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -209,7 +209,7 @@ macro(commom_lib_settings lib write ) PUBLIC $ $ - + PRIVATE $ $ @@ -285,6 +285,7 @@ macro(commom_lib_settings lib write ) if(WIN32) target_link_libraries( ${lib} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/win/Release-x64/zstd_static.lib ) # By wrapping in generator expression we force multi configuration generators (like Visual Studio) @@ -295,8 +296,9 @@ macro(commom_lib_settings lib write ) if(IOS) target_link_libraries( ${lib} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/ios/Release-iphoneos/libzstd.a - ) + ) else() # Set a common RUNTIME_OUTPUT_DIR for all target, so that INSTALL RPATH # is functional in build directory as well. BUILD_WITH_INSTALL_RPATH is necessary @@ -304,8 +306,9 @@ macro(commom_lib_settings lib write ) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$>) target_link_libraries( ${lib} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/mac/Release/libzstd.a - ) + ) endif() elseif(EMSCRIPTEN) target_sources( @@ -318,10 +321,16 @@ macro(commom_lib_settings lib write ) find_package(Threads REQUIRED) target_link_libraries( ${lib} + PUBLIC dl Threads::Threads + ) + target_link_libraries( + ${lib} + PRIVATE zstd::zstd ) + elseif(ANDROID) # add_library(zstd STATIC IMPORTED) # set_target_properties(zstd PROPERTIES @@ -336,6 +345,7 @@ macro(commom_lib_settings lib write ) add_subdirectory(/Users/Shared/SDK/zstd/build/cmake zstd) target_link_libraries( ${lib} + PRIVATE libzstd_static ) endif() @@ -351,7 +361,7 @@ macro(commom_lib_settings lib write ) ) target_include_directories( ${lib} - PUBLIC + PRIVATE $ $ ) @@ -426,10 +436,7 @@ PRIVATE ) target_include_directories( ktx -PUBLIC - $ - $ - +PRIVATE $ $ ) From cef4e639f1245a62ed2d4d56e2f4410e13216260 Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Mon, 16 Nov 2020 12:10:18 +0100 Subject: [PATCH 07/10] fix indentation in tests.cmake --- tests/tests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.cmake b/tests/tests.cmake index aa19eb73a3..cdd6b9c24c 100644 --- a/tests/tests.cmake +++ b/tests/tests.cmake @@ -39,7 +39,7 @@ add_executable( texturetests target_include_directories( texturetests PRIVATE -$ + $ ${PROJECT_SOURCE_DIR}/other_include ${PROJECT_SOURCE_DIR}/lib unittests From 2fd8b919143242bc1a0c0548b5912592364a39db Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Mon, 16 Nov 2020 12:13:56 +0100 Subject: [PATCH 08/10] fix indentation in basiu_c_binding --- interface/basisu_c_binding/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/basisu_c_binding/CMakeLists.txt b/interface/basisu_c_binding/CMakeLists.txt index b1005132a4..37762c133d 100644 --- a/interface/basisu_c_binding/CMakeLists.txt +++ b/interface/basisu_c_binding/CMakeLists.txt @@ -22,7 +22,7 @@ target_include_directories( PUBLIC inc PRIVATE -$ + $ ${PROJECT_SOURCE_DIR}/utils ) From 28571a05a47b73421558f597d77031a0ddc3cb92 Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Mon, 30 Nov 2020 10:34:24 +0100 Subject: [PATCH 09/10] set android zstd link to PRIVATE --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d667271294..d2bec7d9cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -338,6 +338,7 @@ macro(commom_lib_settings lib write ) # ) # target_link_libraries( # ktx + # PRIVATE # zstd # ) set(ZSTD_BUILD_PROGRAMS OFF) From 30255ec133403b75b2e8739e655583e173b18d25 Mon Sep 17 00:00:00 2001 From: Moritz Willy Becher Date: Wed, 9 Dec 2020 17:41:39 +0100 Subject: [PATCH 10/10] whitespace cleanup to trigger travis build --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2bec7d9cb..0d83401c73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ add_library( ktx_read ${LIB_TYPE} ${KTX_MAIN_SRC} ) -macro(commom_lib_settings lib write ) +macro(commom_lib_settings lib write) set_target_properties(${lib} PROPERTIES PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/ktx.h @@ -310,12 +310,14 @@ macro(commom_lib_settings lib write ) ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/mac/Release/libzstd.a ) endif() + elseif(EMSCRIPTEN) target_sources( ${lib} PRIVATE lib/zstddeclib.c ) + elseif(LINUX) find_package(zstd REQUIRED) find_package(Threads REQUIRED)