Skip to content

Commit

Permalink
Build-system fixes (#606)
Browse files Browse the repository at this point in the history
* CMake: Add path to dfdutils headers for toktx

That path was being added to the include dirs of the library ktx only
when `KTX_FEATURE_VULKAN` was enabled, resulting in a build failure
otherwise:

```
    /home/pmoreau/Softwares/KTX-Software/tools/toktx/pngimage.cc:26:10: fatal error: 'dfd.h' file not found
    #include "dfd.h"
             ^~~~~~~
    1 error generated.
```

* CMake: Only build *loadtests if corresponding loader enabled

vkloadtests was still being built even if `KTX_FEATURE_VULKAN` was
disabled, resulting in missing symbols when loading against the ktx
library.
  • Loading branch information
pierremoreau authored Jul 29, 2022
1 parent fe56151 commit 48bb42b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tests/loadtests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,11 @@ set( LOAD_TEST_COMMON_RESOURCE_FILES
${MODELS}
)

include(glloadtests.cmake)
if(KTX_FEATURE_GL_UPLOAD)
include(glloadtests.cmake)
endif()

if(NOT EMSCRIPTEN)
if(KTX_FEATURE_VULKAN AND NOT EMSCRIPTEN)
include(vkloadtests.cmake)
endif()

Expand Down
1 change: 1 addition & 0 deletions tools/toktx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ PRIVATE
$<TARGET_PROPERTY:objUtil,INTERFACE_INCLUDE_DIRECTORIES>
${PROJECT_SOURCE_DIR}/lib
${PROJECT_SOURCE_DIR}/lib/basisu
${PROJECT_SOURCE_DIR}/lib/dfdutils
${PROJECT_SOURCE_DIR}/other_include
)

Expand Down

0 comments on commit 48bb42b

Please sign in to comment.