mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
use project source and binary dirs instead of global dirs
This commit is contained in:
parent
b61bd0b96b
commit
224ba16dcb
@ -1,7 +1,7 @@
|
|||||||
project (ClickHouse)
|
project (ClickHouse)
|
||||||
cmake_minimum_required (VERSION 2.6)
|
cmake_minimum_required (VERSION 2.6)
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
|
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${ClickHouse_SOURCE_DIR}/cmake/Modules/")
|
||||||
|
|
||||||
message(STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE}")
|
message(STATUS "Building for: ${CMAKE_SYSTEM} ${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_LIBRARY_ARCHITECTURE}")
|
||||||
|
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
|
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/dbms/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/dbms/include)
|
||||||
|
|
||||||
# TODO:
|
# TODO:
|
||||||
# move code with incldes from .h to .cpp and clean this list:
|
# move code with incldes from .h to .cpp and clean this list:
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libcommon/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libcommon/include)
|
||||||
# for generated config_version.h and config_common.h:
|
# for generated config_version.h and config_common.h:
|
||||||
include_directories (${CMAKE_BINARY_DIR}/libs/libcommon/include)
|
include_directories (${ClickHouse_BINARY_DIR}/libs/libcommon/include)
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libpocoext/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libpocoext/include)
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libzkutil/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libzkutil/include)
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libmysqlxx/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libmysqlxx/include)
|
||||||
include_directories (BEFORE ${CMAKE_SOURCE_DIR}/contrib/libzookeeper/include)
|
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libzookeeper/include)
|
||||||
include_directories (BEFORE ${CMAKE_SOURCE_DIR}/contrib/libcityhash/include)
|
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libcityhash/include)
|
||||||
include_directories (BEFORE ${CMAKE_SOURCE_DIR}/contrib/libdouble-conversion)
|
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libdouble-conversion)
|
||||||
|
@ -195,16 +195,16 @@ endmacro()
|
|||||||
macro(POCO_GENERATE_PACKAGE target_name)
|
macro(POCO_GENERATE_PACKAGE target_name)
|
||||||
include(CMakePackageConfigHelpers)
|
include(CMakePackageConfigHelpers)
|
||||||
write_basic_package_version_file(
|
write_basic_package_version_file(
|
||||||
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
|
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
|
||||||
VERSION ${PROJECT_VERSION}
|
VERSION ${PROJECT_VERSION}
|
||||||
COMPATIBILITY AnyNewerVersion
|
COMPATIBILITY AnyNewerVersion
|
||||||
)
|
)
|
||||||
#export(EXPORT "${target_name}Targets"
|
#export(EXPORT "${target_name}Targets"
|
||||||
# FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Targets.cmake"
|
# FILE "${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Targets.cmake"
|
||||||
# NAMESPACE "${PROJECT_NAME}::"
|
# NAMESPACE "${PROJECT_NAME}::"
|
||||||
#)
|
#)
|
||||||
configure_file("cmake/Poco${target_name}Config.cmake"
|
configure_file("cmake/Poco${target_name}Config.cmake"
|
||||||
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
|
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
|
||||||
@ONLY
|
@ONLY
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -219,8 +219,8 @@ install(
|
|||||||
|
|
||||||
install(
|
install(
|
||||||
FILES
|
FILES
|
||||||
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
|
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
|
||||||
"${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
|
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
|
||||||
DESTINATION "lib/cmake/${PROJECT_NAME}"
|
DESTINATION "lib/cmake/${PROJECT_NAME}"
|
||||||
COMPONENT Devel
|
COMPONENT Devel
|
||||||
)
|
)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
include(${CMAKE_SOURCE_DIR}/cmake/dbms_include.cmake)
|
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_include.cmake)
|
||||||
|
|
||||||
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/liblz4/include/)
|
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/liblz4/include/)
|
||||||
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libdivide)
|
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libdivide)
|
||||||
@ -127,7 +127,7 @@ else()
|
|||||||
find_library (Z_LIB z HINTS ${Z_HINTS})
|
find_library (Z_LIB z HINTS ${Z_HINTS})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
include (${CMAKE_SOURCE_DIR}/cmake/find_iconv.cmake)
|
include (${ClickHouse_SOURCE_DIR}/cmake/find_iconv.cmake)
|
||||||
find_package (Threads)
|
find_package (Threads)
|
||||||
|
|
||||||
target_link_libraries(dbms
|
target_link_libraries(dbms
|
||||||
|
@ -3,9 +3,9 @@ set (CONFIG_COMMON ${CMAKE_CURRENT_BINARY_DIR}/include/common/config_common.h)
|
|||||||
set (CONFIG_BUILD ${CMAKE_CURRENT_BINARY_DIR}/src/config_build.cpp)
|
set (CONFIG_BUILD ${CMAKE_CURRENT_BINARY_DIR}/src/config_build.cpp)
|
||||||
|
|
||||||
include_directories (include)
|
include_directories (include)
|
||||||
include_directories (BEFORE ${CMAKE_SOURCE_DIR}/contrib/libcctz/include)
|
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libcctz/include)
|
||||||
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/dbms_include.cmake)
|
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_include.cmake)
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT "${CMAKE_SYSTEM_VERSION}" VERSION_LESS "16.1.0")
|
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" AND NOT "${CMAKE_SYSTEM_VERSION}" VERSION_LESS "16.1.0")
|
||||||
@ -20,8 +20,8 @@ message (STATUS "Will build ${VERSION_FULL}")
|
|||||||
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/common/config_common.h.in ${CONFIG_COMMON})
|
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/common/config_common.h.in ${CONFIG_COMMON})
|
||||||
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/common/config_version.h.in ${CONFIG_VERSION})
|
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/common/config_version.h.in ${CONFIG_VERSION})
|
||||||
|
|
||||||
get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
|
get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
|
||||||
get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
|
get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
|
||||||
|
|
||||||
string (TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
|
string (TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
|
||||||
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/config_build.cpp.in ${CONFIG_BUILD})
|
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/config_build.cpp.in ${CONFIG_BUILD})
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
include_directories (include)
|
include_directories (include)
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/dbms_include.cmake)
|
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_include.cmake)
|
||||||
|
|
||||||
add_library (daemon
|
add_library (daemon
|
||||||
src/BaseDaemon.cpp
|
src/BaseDaemon.cpp
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
include (cmake/find_mysqlclient.cmake)
|
include (cmake/find_mysqlclient.cmake)
|
||||||
|
|
||||||
include_directories (include)
|
include_directories (include)
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libcommon/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libcommon/include)
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/dbms_include.cmake)
|
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_include.cmake)
|
||||||
|
|
||||||
add_library (mysqlxx
|
add_library (mysqlxx
|
||||||
src/Connection.cpp
|
src/Connection.cpp
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
include_directories (include)
|
include_directories (include)
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libcommon/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libcommon/include)
|
||||||
|
|
||||||
add_library (pocoext
|
add_library (pocoext
|
||||||
src/LevelFilterChannel.cpp
|
src/LevelFilterChannel.cpp
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
include_directories (include)
|
include_directories (include)
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libcommon/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libcommon/include)
|
||||||
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/dbms_include.cmake)
|
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_include.cmake)
|
||||||
|
|
||||||
add_library(zkutil
|
add_library(zkutil
|
||||||
src/ZooKeeper.cpp
|
src/ZooKeeper.cpp
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
include(${CMAKE_SOURCE_DIR}/cmake/dbms_include.cmake)
|
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_include.cmake)
|
||||||
|
|
||||||
if (NOT NO_WERROR)
|
if (NOT NO_WERROR)
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
include_directories (BEFORE ${CMAKE_SOURCE_DIR}/contrib/libzstd/include)
|
include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libzstd/include)
|
||||||
|
|
||||||
add_executable (clickhouse-compressor main.cpp)
|
add_executable (clickhouse-compressor main.cpp)
|
||||||
target_link_libraries (clickhouse-compressor dbms ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
target_link_libraries (clickhouse-compressor dbms ${Boost_PROGRAM_OPTIONS_LIBRARY})
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
include_directories (${CMAKE_SOURCE_DIR}/dbms/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/dbms/include)
|
||||||
|
|
||||||
add_executable(corrector_utf8 corrector_utf8.cpp)
|
add_executable(corrector_utf8 corrector_utf8.cpp)
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
include_directories (${CMAKE_SOURCE_DIR}/dbms/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/dbms/include)
|
||||||
include_directories (${CMAKE_SOURCE_DIR}/libs/libcommon/include)
|
include_directories (${ClickHouse_SOURCE_DIR}/libs/libcommon/include)
|
||||||
|
|
||||||
add_executable (iotest iotest.cpp ${SRCS})
|
add_executable (iotest iotest.cpp ${SRCS})
|
||||||
target_link_libraries (iotest dbms)
|
target_link_libraries (iotest dbms)
|
||||||
|
Loading…
Reference in New Issue
Block a user