reverted changing of binary dir in PocoMacros.cmake

This commit is contained in:
Pavel Kartavyy 2017-02-10 16:54:55 +03:00
parent eceb688c7f
commit 1746fd6c48

View File

@ -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(
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake" "${CMAKE_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 "${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Targets.cmake" # FILE "${CMAKE_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"
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
@ONLY @ONLY
) )
@ -219,8 +219,8 @@ install(
install( install(
FILES FILES
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake"
"${ClickHouse_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake"
DESTINATION "lib/cmake/${PROJECT_NAME}" DESTINATION "lib/cmake/${PROJECT_NAME}"
COMPONENT Devel COMPONENT Devel
) )