database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-04-18 21:24:07 +03:00
Code

Removed CMakeLists.txt from merge exceptions (.gitattributes).

Browse Source
This commit is contained in:
Georg Richter 2023-02-21 15:34:21 +01:00
parent e9ec8f2976
commit ae8d3fea26
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -7,4 +7,3 @@
# merge
.travis.yml merge=cc
CMakeLists.txt merge=cc

6
CMakeLists.txt
View File

@ -239,11 +239,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)