Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
FEATURE_JNI: ${{ matrix.options.jni }}
FEATURE_LOADTESTS: ${{ matrix.options.loadtests }}
FEATURE_PY: ${{ matrix.options.py }}
FEATURE_TESTS: ${{ matrix.options.tests && matrix.options.tests || 'ON' }}
FEATURE_TESTS: ${{ matrix.options.tests && matrix.options.tests || 'OFF' }}
FEATURE_TOOLS: ${{ matrix.options.tools }}
FEATURE_TOOLS_CTS: ${{ matrix.options.tools_cts }}
PACKAGE: ${{ matrix.options.package && matrix.options.package || 'NO' }}
Expand Down
11 changes: 8 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ option( KTX_FEATURE_ETC_UNPACK "ETC decoding support." ON )
if(KTX_FEATURE_TOOLS_CTS AND NOT KTX_FEATURE_TOOLS)
message(WARNING "KTX_FEATURE_TOOLS is not set -> disabling KTX_FEATURE_TOOLS_CTS.")
set(KTX_FEATURE_TOOLS_CTS "OFF")
elseif(KTX_FEATURE_TOOLS_CTS AND NOT KTX_FEATURE_TESTS)
message(WARNING "KTX_FEATURE_TESTS is not set -> disabling KTX_FEATURE_TOOLS_CTS.")
set(KTX_FEATURE_TOOLS_CTS "OFF")
endif()

if(POLICY CMP0127)
Expand Down Expand Up @@ -261,6 +258,14 @@ if(KTX_GENERATE_VK_FILES)
endif()

# EMSCRIPTEN is not set until project so all these must be after.
if(APPLE_LOCKED_OS OR ANDROID OR EMSCRIPTEN)
message(WARNING "Building unit tests for Android, Apple locked OSes or the web is not supported -> disabling KTX_FEATURE_TESTS.")
set(KTX_FEATURE_TESTS "OFF")
endif()
if(KTX_FEATURE_TOOLS_CTS AND NOT KTX_FEATURE_TESTS)
message(WARNING "KTX_FEATURE_TESTS is not set -> disabling KTX_FEATURE_TOOLS_CTS.")
set(KTX_FEATURE_TOOLS_CTS "OFF")
endif()
if(APPLE_LOCKED_OS OR EMSCRIPTEN)
set( LIB_TYPE_DEFAULT OFF )
else()
Expand Down
1 change: 1 addition & 0 deletions scripts/build_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ cmake_args=("-G" "Ninja" \
"-D" "CMAKE_BUILD_TYPE=$CONFIGURATION" \
"-D" "BASISU_SUPPORT_SSE=OFF" \
"-D" "${ASTCENC_ISA}"
"-D" "KTX_FEATURE_TESTS=OFF"
"-D" "KTX_WERROR=$WERROR"
)

Expand Down
8 changes: 5 additions & 3 deletions scripts/build_wasm_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ FEATURE_DOC=${FEATURE_DOC:-OFF}
FEATURE_JNI=${FEATURE_JNI:-OFF}
FEATURE_LOADTESTS=${FEATURE_LOADTESTS:-OpenGL}
FEATURE_PY=${FEATURE_PY:-OFF}
FEATURE_TESTS=${FEATURE_TESTS:-OFF}
FEATURE_TOOLS=${FEATURE_TOOLS:-OFF}
PACKAGE=${PACKAGE:-NO}
SUPPORT_SSE=OFF
Expand Down Expand Up @@ -135,10 +136,11 @@ fi

docker exec emscripten sh -c "emcmake cmake -B$BUILD_DIR . \
-D CMAKE_BUILD_TYPE=$CONFIGURATION \
-D KTX_FEATURE_DOC=OFF \
-D KTX_FEATURE_JNI=OFF \
-D KTX_FEATURE_DOC=$FEATURE_DOC \
-D KTX_FEATURE_JNI=$FEATURE_JNI \
-D KTX_FEATURE_LOADTEST_APPS=$FEATURE_LOADTESTS \
-D KTX_FEATURE_TOOLS=OFF \
-D KTX_FEATURE_TESTS=$FEATURE_TESTS \
-D KTX_FEATURE_TOOLS=$FEATURE_TOOLS \
-D KTX_WERROR=$WERROR \
&& cmake --build $BUILD_DIR $targets $verbose_make"

Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if(KTX_FEATURE_LOADTEST_APPS)
endif()

# gtest based unit-tests
if(KTX_FEATURE_TESTS AND NOT APPLE_LOCKED_OS AND NOT ANDROID AND NOT EMSCRIPTEN)
if(KTX_FEATURE_TESTS)
# Used by texturetests as well as CTS.
add_subdirectory(ktxdiff)
set(KTX_DIFF_PATH $<TARGET_FILE:ktxdiff>)
Expand Down