Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix an issue with the generated KtxTargets.cmake #325

Merged
merged 11 commits into from
Dec 11, 2020
Merged

Fix an issue with the generated KtxTargets.cmake #325

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f5b40b
make ktx target includes and libs private
UX3D-becher Oct 8, 2020
4875a85
fixed more INTERFACE_INCLUDE_DIRECTORIES
UX3D-becher Oct 8, 2020
4f903cd
only zstd private linux library dependency
UX3D-becher Oct 8, 2020
e915476
fixed cmake syntax
UX3D-becher Oct 8, 2020
c68ee1d
moved Threads::Threads to private dependencies
UX3D-becher Oct 9, 2020
9fa02b6
Merge remote-tracking branch 'origin/master' into cmake-config-file-fix
UX3D-becher Nov 16, 2020
255e4f2
private include and library dependencies
UX3D-becher Nov 16, 2020
cef4e63
fix indentation in tests.cmake
UX3D-becher Nov 16, 2020
2fd8b91
fix indentation in basiu_c_binding
UX3D-becher Nov 16, 2020
28571a0
set android zstd link to PRIVATE
UX3D-becher Nov 30, 2020
30255ec
whitespace cleanup to trigger travis build
UX3D-becher Dec 9, 2020
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
24 changes: 16 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ macro(commom_lib_settings lib write )
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>

PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu/transcoder>
$<INSTALL_INTERFACE:lib/basisu/transcoder>
MarkCallow marked this conversation as resolved.
Show resolved Hide resolved

Expand Down Expand Up @@ -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)
Expand All @@ -295,17 +296,19 @@ 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
# for working code signing.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$<CONFIG>>)
target_link_libraries(
${lib}
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/other_lib/mac/Release/libzstd.a
)
)
endif()
elseif(EMSCRIPTEN)
target_sources(
Expand All @@ -318,24 +321,32 @@ 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
# IMPORTED_LOCATION /Users/Shared/SDK/zstd/build/cmake/install-android/lib/libzstd.a
# )
# target_link_libraries(
# ktx
# PRIVATE
# zstd
# )
set(ZSTD_BUILD_PROGRAMS OFF)
set(ZSTD_BUILD_TESTS OFF)
add_subdirectory(/Users/Shared/SDK/zstd/build/cmake zstd)
target_link_libraries(
${lib}
PRIVATE
libzstd_static
)
endif()
Expand All @@ -351,7 +362,7 @@ macro(commom_lib_settings lib write )
)
target_include_directories(
${lib}
PUBLIC
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/dfdutils>
$<INSTALL_INTERFACE:lib/dfdutils>
MarkCallow marked this conversation as resolved.
Show resolved Hide resolved
)
Expand Down Expand Up @@ -426,10 +437,7 @@ PRIVATE
)
target_include_directories(
ktx
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib>
$<INSTALL_INTERFACE:lib>

PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu>
$<INSTALL_INTERFACE:lib/basisu>
MarkCallow marked this conversation as resolved.
Show resolved Hide resolved
)
Expand Down
2 changes: 1 addition & 1 deletion interface/basisu_c_binding/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ target_include_directories(
PUBLIC
inc
PRIVATE
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/utils
)

Expand Down
2 changes: 1 addition & 1 deletion tests/loadtests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ target_include_directories(
PUBLIC
${SDL2_INCLUDE_DIRS}
appfwSDL
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/other_include
${PROJECT_SOURCE_DIR}/utils
Expand Down
2 changes: 1 addition & 1 deletion tests/loadtests/glloadtests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function( create_gl_target target sources KTX_GL_CONTEXT_PROFILE KTX_GL_CONTEXT_
PRIVATE
$<TARGET_PROPERTY:appfwSDL,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:GLAppSDL,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
)

Expand Down
2 changes: 1 addition & 1 deletion tests/loadtests/vkloadtests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ target_include_directories(
PRIVATE
${SDL2_INCLUDE_DIRS}
$<TARGET_PROPERTY:appfwSDL,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
appfwSDL/VulkanAppSDL
vkloadtests
Expand Down
4 changes: 2 additions & 2 deletions tests/tests.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ add_executable( unittests
target_include_directories(
unittests
PRIVATE
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
)

Expand All @@ -39,7 +39,7 @@ add_executable( texturetests
target_include_directories(
texturetests
PRIVATE
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/other_include
${PROJECT_SOURCE_DIR}/lib
unittests
Expand Down
2 changes: 1 addition & 1 deletion tests/transcodetests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ add_executable( transcodetests
target_include_directories(
transcodetests
PRIVATE
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:obj_basisu_cbind,INTERFACE_INCLUDE_DIRECTORIES>
${CMAKE_CURRENT_SOURCE_DIR}/../../other_include
${CMAKE_CURRENT_SOURCE_DIR}/../../lib
Expand Down
2 changes: 1 addition & 1 deletion tools/ktx2check/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target_include_directories(
ktx2check
PRIVATE
.
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/other_include
Expand Down
2 changes: 1 addition & 1 deletion tools/ktx2ktx2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target_include_directories(
ktx2ktx2
PRIVATE
.
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/other_include
Expand Down
2 changes: 1 addition & 1 deletion tools/ktxinfo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target_include_directories(
ktxinfo
PRIVATE
.
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
)
Expand Down
2 changes: 1 addition & 1 deletion tools/ktxsc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target_include_directories(
ktxsc
PRIVATE
.
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/other_include
Expand Down
2 changes: 1 addition & 1 deletion tools/toktx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_include_directories(
toktx
PRIVATE
.
$<TARGET_PROPERTY:ktx,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ktx,INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/lib/basisu
Expand Down