thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 00:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cmake: fix includes with PATH_SUFFIXES (#387)

Browse Source
This commit is contained in:
proller 2017-01-24 22:54:35 +03:00 committed by alexey-milovidov
parent c9e52a5cf9
commit b068ffb100
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/find_icu4c.cmake
View File

@ -11,6 +11,6 @@ else ()
endif ()
set (ICU_LIBS ${ICUI18N} ${ICUUC} ${ICUDATA})
find_path (ICU_INCLUDE_DIR NAMES unistr.h PATH_SUFFIXES unicode PATHS ${ICU_INCLUDE_PATHS})
find_path (ICU_INCLUDE_DIR NAMES unicode/unistr.h PATHS ${ICU_INCLUDE_PATHS})
message(STATUS "Using icu: ${ICU_INCLUDE_DIR} : ${ICU_LIBS}")
include_directories (${ICU_INCLUDE_DIR})

4
cmake/find_readline_edit.cmake
View File

@ -20,7 +20,7 @@ if (NOT READLINE_PATHS)
set(READLINE_INCLUDE_PATHS "/usr/local/opt/readline/include")
if (READLINE_LIB)
find_path (READLINE_INCLUDE_DIR NAMES readline.h PATH_SUFFIXES readline PATHS ${READLINE_INCLUDE_PATHS})
find_path (READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
add_definitions (-D USE_READLINE)
set (LINE_EDITING_LIBS ${READLINE_LIB} ${TERMCAP_LIB})
message (STATUS "Using line editing libraries (readline): ${READLINE_INCLUDE_DIR} : ${LINE_EDITING_LIBS}")
@ -31,7 +31,7 @@ if (NOT READLINE_PATHS)
find_library (CURSES_LIB NAMES curses)
endif ()
add_definitions (-D USE_LIBEDIT)
find_path (READLINE_INCLUDE_DIR NAMES readline.h PATH_SUFFIXES editline PATHS ${READLINE_INCLUDE_PATHS})
find_path (READLINE_INCLUDE_DIR NAMES editline/readline.h PATHS ${READLINE_INCLUDE_PATHS})
set (LINE_EDITING_LIBS ${EDIT_LIB} ${CURSES_LIB} ${TERMCAP_LIB})
message (STATUS "Using line editing libraries (edit): ${READLINE_INCLUDE_DIR} : ${LINE_EDITING_LIBS}")
else ()

2
libs/libmysqlxx/cmake/find_mysqlclient.cmake
View File

@ -18,7 +18,7 @@ set (MYSQL_INCLUDE_PATHS
"/usr/include/mysql"
)
find_path (MYSQL_INCLUDE_DIR NAMES mysql.h PATH_SUFFIXES mysql PATHS ${MYSQL_INCLUDE_PATHS})
find_path (MYSQL_INCLUDE_DIR NAMES mysql/mysql.h PATHS ${MYSQL_INCLUDE_PATHS})
if (USE_STATIC_LIBRARIES)
find_library (STATIC_MYSQLCLIENT_LIB libmysqlclient.a PATHS ${MYSQL_LIB_PATHS})

2
libs/libmysqlxx/src/Connection.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqlxx/Connection.h>
#include <mysqlxx/Exception.h>

2
libs/libmysqlxx/src/Exception.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqlxx/Exception.h>

2
libs/libmysqlxx/src/Pool.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqld_error.h>
#include <mysqlxx/Pool.h>

2
libs/libmysqlxx/src/Query.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqlxx/Connection.h>
#include <mysqlxx/Query.h>

2
libs/libmysqlxx/src/ResultBase.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqlxx/Connection.h>
#include <mysqlxx/ResultBase.h>

2
libs/libmysqlxx/src/Row.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqlxx/Row.h>

2
libs/libmysqlxx/src/StoreQueryResult.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqlxx/Connection.h>
#include <mysqlxx/StoreQueryResult.h>

2
libs/libmysqlxx/src/UseQueryResult.cpp
View File

@ -1,4 +1,4 @@
#include <mysql.h>
#include <mysql/mysql.h>
#include <mysqlxx/Connection.h>
#include <mysqlxx/UseQueryResult.h>