Skip to content

Commit

Permalink
SAIL: Use BUILD_TESTING instead of SAIL_BUILD_TESTS
Browse files Browse the repository at this point in the history
  • Loading branch information
HappySeaFox committed Oct 27, 2023
1 parent ec626dd commit 3d64e30
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ vcpkg install sail
### CMake options overview

- `SAIL_BUILD_EXAMPLES=ON|OFF` - Build examples. Default: `ON`
- `SAIL_BUILD_TESTS=ON|OFF` - Build tests. Default: `ON`
- `SAIL_COLORED_OUTPUT=ON|OFF` - Enable colored console output on Windows >= 10 and Unix platforms. Default: `ON`
- `SAIL_COMBINE_CODECS=ON|OFF` - Combine all codecs into a single library. Static build always sets this option to ON. Default: `OFF`
- `SAIL_DEV=ON|OFF` - Enable developer mode with pedantic warnings and possible `ASAN` enabled for examples. Default: `OFF`
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include(CheckCSourceCompiles)
include(CheckCSourceRuns)
include(CMakeDependentOption)
include(CMakePushCheckState)
include(CTest)

# Our own cmake scripts
#
Expand Down Expand Up @@ -75,7 +76,6 @@ endif()
#
option(SAIL_BUILD_APPS "Build applications." ON)
option(SAIL_BUILD_EXAMPLES "Build examples." ON)
option(SAIL_BUILD_TESTS "Build tests." ON)
option(SAIL_DEV "Enable developer mode. Be more strict when compiling source code, for example." OFF)
set(SAIL_ENABLE_CODECS "" CACHE STRING "Forcefully enable the codecs specified in this ';'-separated list. \
If an enabled codec fails to find its dependencies, the configuration process fails. \
Expand Down Expand Up @@ -233,7 +233,7 @@ if (SAIL_BUILD_EXAMPLES)
endif()
endif()

if (SAIL_BUILD_TESTS)
if (BUILD_TESTING)
add_subdirectory(tests)
endif()

Expand Down Expand Up @@ -321,7 +321,7 @@ message("* Colored output: ${SAIL_COLORED_OUTPUT}${SAIL_COLORED_OU
message("* Build apps: ${SAIL_BUILD_APPS}")
message("* Build examples: ${SAIL_BUILD_EXAMPLES}")
message("* Build SDL example: ${SAIL_SDL_EXAMPLE}")
message("* Build tests: ${SAIL_BUILD_TESTS}")
message("* Build tests: ${BUILD_TESTING}")
message("* Install PDB files: ${SAIL_INSTALL_PDB}")
message("*")
message("* SAIL_HAVE_BUILTIN_BSWAP16: ${SAIL_HAVE_BUILTIN_BSWAP16_DISPLAY}")
Expand Down
2 changes: 0 additions & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
enable_testing()

# Test images
#
set(SAIL_TEST_IMAGES_PATH ${CMAKE_CURRENT_SOURCE_DIR}/images)
Expand Down

0 comments on commit 3d64e30

Please sign in to comment.