Skip to content

Commit 1959b01

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.
1 parent aed5841 commit 1959b01

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,6 +1252,9 @@ if(NOT ${universal_build})
12521252
endif()
12531253
endif()
12541254

1255+
# setting ASTCENC_DECOMPRESSOR to ON breaks the build, so force ot 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)