Skip to content

Commit 39c9a70

Browse files
committed
Hide the ASTCENC_DECOMPRESSOR option and set it to OFF
It's an option provided by external/astc-encoder/CMakeLists.txt but setting it to ON in KTX-Software breaks the build. So set it to OFF and make it an INTERNAL variable so it's not shown in cmake-gui where it could lure users to enable it. While at it, also fixed the line number in a comment, and a typo in another comment.
1 parent caa200f commit 39c9a70

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ endif()
967967

968968
# Retrieve the final set of properties for use by the transcodetests.
969969
# We do this because the CMake feature that would allow the transcodetests
970-
# target to retrieve these from the ktx target are not available until
970+
# target to retrieve these from the ktx target is not available until
971971
# v18 and we still need to work with v16 in the Emscripten Docker image.
972972
get_source_file_property(transcoder_options
973973
external/basisu/transcoder/basisu_transcoder.cpp
@@ -1252,6 +1252,9 @@ if(NOT ${universal_build})
12521252
endif()
12531253
endif()
12541254

1255+
# setting ASTCENC_DECOMPRESSOR to ON breaks the build, so force it to OFF
1256+
# and hide it from cmake-gui (by using type INTERNAL)
1257+
set(ASTCENC_DECOMPRESSOR OFF CACHE INTERNAL "")
12551258
set(ASTCENC_CLI OFF) # Only build as library not the CLI astcencoder
12561259
# Force static build for astc-encoder
12571260
set(BUILD_SHARED_LIBS OFF)
@@ -1262,7 +1265,7 @@ target_compile_definitions(
12621265
${ASTCENC_LIB_TARGET}
12631266
PRIVATE
12641267
# ASTC encoder uses std::mutex. For more info. see comment about
1265-
# same setting in libktx starting about line 618. To be eventually
1268+
# same setting in libktx starting about line 633. To be eventually
12661269
# removed as noted in that comment.
12671270
$<$<AND:${is_msvccl},$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,19.40.33811>>:_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR>
12681271
$<$<AND:${is_clangcl},$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,17.0.3>>:_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR>

0 commit comments

Comments
 (0)