at 24.05-pre 61 lines 2.2 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 80a3bdcd6..380a1573a 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -61,7 +61,7 @@ option( 6 "Link dependencies using CMake's find_package and do not use internal builds" 7 ${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT} 8 ) 9-option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON) 10+option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF) 11 # This option isn't recommended for distribution builds and probably won't work (yet). 12 cmake_dependent_option( 13 SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES 14@@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF) 15 option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF) 16 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.") 17 18-if(SRB2_CONFIG_ENABLE_TESTS) 19- # https://github.com/catchorg/Catch2 20- CPMAddPackage( 21- NAME Catch2 22- VERSION 3.4.0 23- GITHUB_REPOSITORY catchorg/Catch2 24- OPTIONS 25- "CATCH_INSTALL_DOCS OFF" 26- ) 27- list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras") 28- include(CTest) 29- include(Catch) 30- add_executable(srb2tests) 31- # To add tests, use target_sources to add individual test files to the target in subdirs. 32- target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain) 33- target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17) 34- catch_discover_tests(srb2tests) 35-endif() 36- 37 # Enable CCache 38 # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options) 39 if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) 40@@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) 41 message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)") 42 endif() 43 endif() 44-else() 45- CPMAddPackage( 46- NAME Ccache.cmake 47- GITHUB_REPOSITORY TheLartians/Ccache.cmake 48- VERSION 1.2 49- ) 50 endif() 51 52 # Dependencies 53@@ -179,7 +154,7 @@ include(GitUtilities) 54 if("${SRB2_SDL2_EXE_NAME}" STREQUAL "") 55 # cause a reconfigure if the branch changes 56 get_git_dir(SRB2_GIT_DIR) 57- configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) 58+ #configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) 59 60 git_current_branch(SRB2_GIT_REVISION) 61