Have cmake also execute the conftests.

wesnoth · May 3, 2022 · 16be133 · 16be133
1 parent 0712c33
commit 16be133
Show file tree

Hide file tree

Showing 12 changed files with 333 additions and 226 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,15 @@ uninstall.cmake
 CMakeCache.txt
 install_manifest.txt
 out/**/*
+CTestTestfile.cmake
+DartConfiguration.tcl
+Testing/*
+doc/CTestTestfile.cmake
+doc/design/CTestTestfile.cmake
+doc/man/CTestTestfile.cmake
+doc/manual/CTestTestfile.cmake
+src/CTestTestfile.cmake
+src/Testing/
 
 # scons
 .scons-option-cache

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.14)
 project(wesnoth)
 
 include(CheckCXXCompilerFlag)
+include(CTest)
 
 # use our own version of FindBoost.cmake and other Find* scripts
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

diff --git a/SConstruct b/SConstruct
@@ -350,9 +350,9 @@ if env["prereqs"]:
 
     def have_sdl_other():
         return \
-            conf.CheckSDL(require_version = '2.0.8') & \
-            conf.CheckSDL("SDL2_mixer", header_file = "SDL_mixer") & \
-            conf.CheckSDL("SDL2_image", header_file = "SDL_image")
+            conf.CheckSDL2('2.0.8') & \
+            conf.CheckSDL2Mixer() & \
+            conf.CheckSDL2Image()
 
     if sys.platform == "msys":
         env["PKG_CONFIG_FLAGS"] = "--dont-define-prefix"