Skip to content

Commit

Permalink
Do target_type changes only in toktx (KhronosGroup#757)
Browse files Browse the repository at this point in the history
They were being done in both `toktx` and the `imageinput` plugin.

Fixes KhronosGroup#727.

* Move image-related utilities and image.hpp from `ktxtools` to `imageio` target for sharing
   between new and legacy tools.
* Change `toktx` to use the updated version of image.hpp.
* Make `other_Includes` a system include for `imageio` and `unittests`.
* Make `toktx`  use `imageio`'s INTERFACE includes instead of directly referencing the directories.
* Fix mismatched `new[]` and `delete` in `glloadtests`.
  • Loading branch information
MarkCallow authored Aug 27, 2023
1 parent f690376 commit c30b03a
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -505,13 +505,18 @@ macro(common_libktx_settings target enable_write library_type)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu/zstd>
$<INSTALL_INTERFACE:lib/basisu/zstd>

$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
$<INSTALL_INTERFACE:other_include>

$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils>
$<INSTALL_INTERFACE:utils>
)

target_include_directories(
${target}
SYSTEM
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
$<INSTALL_INTERFACE:other_include>
)

if( ${library_type} STREQUAL STATIC )
target_compile_definitions(${target} PUBLIC KHRONOS_STATIC)
endif()
Expand Down

0 comments on commit c30b03a

Please sign in to comment.