Fix for PR-210:

- renamed CheckIncludeFiles to avoid recursive inclusion (and also renamed other Check* files) - Added cmake subdirectory to CMAKE_MODULE_PATH
mariadb-corporation · Feb 21, 2023 · 000415a · 000415a
1 parent 516dd92
commit 000415a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -189,6 +189,8 @@ IF(NOT MARIADB_UNIX_ADDR)
   SET(MARIADB_UNIX_ADDR "/tmp/mysql.sock")
 ENDIF()
 
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CC_SOURCE_DIR}/cmake)
+
 INCLUDE("${CC_SOURCE_DIR}/cmake/install.cmake")
 IF(NOT PLUGINDIR)
   SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}")
@@ -217,11 +219,11 @@ IF(NOT WIN32)
 ENDIF()
 
 # check for various include files
-INCLUDE(${CC_SOURCE_DIR}/cmake/CheckIncludeFiles.cmake)
+INCLUDE(${CC_SOURCE_DIR}/cmake/check_include_files.cmake)
 # check for various functions
-INCLUDE(${CC_SOURCE_DIR}/cmake/CheckFunctions.cmake)
+INCLUDE(${CC_SOURCE_DIR}/cmake/check_functions.cmake)
 # check for various types
-INCLUDE(${CC_SOURCE_DIR}/cmake/CheckTypes.cmake)
+INCLUDE(${CC_SOURCE_DIR}/cmake/check_types.cmake)
 
 IF(UNIX)
   SEARCH_LIBRARY(LIBM floor m)

diff --git a/cmake/CheckFunctions.cmake → cmake/check_functions.cmake b/cmake/CheckFunctions.cmake → cmake/check_functions.cmake
diff --git a/cmake/CheckIncludeFiles.cmake → cmake/check_include_files.cmake b/cmake/CheckIncludeFiles.cmake → cmake/check_include_files.cmake
diff --git a/cmake/CheckTypes.cmake → cmake/check_types.cmake b/cmake/CheckTypes.cmake → cmake/check_types.cmake