Luke Granger-Brown
57725ef3ec
git-subtree-dir: third_party/nixpkgs git-subtree-split: 76612b17c0ce71689921ca12d9ffdc9c23ce40b2
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 80a3bdcd6..380a1573a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -61,7 +61,7 @@ option(
|
|
"Link dependencies using CMake's find_package and do not use internal builds"
|
|
${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT}
|
|
)
|
|
-option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON)
|
|
+option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF)
|
|
# This option isn't recommended for distribution builds and probably won't work (yet).
|
|
cmake_dependent_option(
|
|
SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES
|
|
@@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF)
|
|
option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF)
|
|
set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.")
|
|
|
|
-if(SRB2_CONFIG_ENABLE_TESTS)
|
|
- # https://github.com/catchorg/Catch2
|
|
- CPMAddPackage(
|
|
- NAME Catch2
|
|
- VERSION 3.4.0
|
|
- GITHUB_REPOSITORY catchorg/Catch2
|
|
- OPTIONS
|
|
- "CATCH_INSTALL_DOCS OFF"
|
|
- )
|
|
- list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras")
|
|
- include(CTest)
|
|
- include(Catch)
|
|
- add_executable(srb2tests)
|
|
- # To add tests, use target_sources to add individual test files to the target in subdirs.
|
|
- target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain)
|
|
- target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17)
|
|
- catch_discover_tests(srb2tests)
|
|
-endif()
|
|
-
|
|
# Enable CCache
|
|
# (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options)
|
|
if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
|
|
@@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows)
|
|
message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)")
|
|
endif()
|
|
endif()
|
|
-else()
|
|
- CPMAddPackage(
|
|
- NAME Ccache.cmake
|
|
- GITHUB_REPOSITORY TheLartians/Ccache.cmake
|
|
- VERSION 1.2
|
|
- )
|
|
endif()
|
|
|
|
# Dependencies
|
|
@@ -179,7 +154,7 @@ include(GitUtilities)
|
|
if("${SRB2_SDL2_EXE_NAME}" STREQUAL "")
|
|
# cause a reconfigure if the branch changes
|
|
get_git_dir(SRB2_GIT_DIR)
|
|
- configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY)
|
|
+ #configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY)
|
|
|
|
git_current_branch(SRB2_GIT_REVISION)
|
|
|