From ccd967e2e75d08c48592a99fad55684aad0a5583 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Mon, 7 Jan 2019 10:37:34 +0300 Subject: [PATCH] Fixed issue with libhdfs [#CLICKHOUSE-2] --- contrib/libhdfs3-cmake/CMake/Options.cmake | 32 ++++++++-------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/contrib/libhdfs3-cmake/CMake/Options.cmake b/contrib/libhdfs3-cmake/CMake/Options.cmake index 5561f3ccc1e..fd92efb34aa 100644 --- a/contrib/libhdfs3-cmake/CMake/Options.cmake +++ b/contrib/libhdfs3-cmake/CMake/Options.cmake @@ -9,16 +9,6 @@ INCLUDE (CheckFunctionExists) CHECK_FUNCTION_EXISTS(dladdr HAVE_DLADDR) CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP) -IF(ENABLE_DEBUG STREQUAL ON) - SET(CMAKE_BUILD_TYPE Debug CACHE - STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) - SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0" CACHE STRING "compiler flags for debug" FORCE) - SET(CMAKE_C_FLAGS_DEBUG "-g -O0" CACHE STRING "compiler flags for debug" FORCE) -ELSE(ENABLE_DEBUG STREQUAL ON) - SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE - STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) -ENDIF(ENABLE_DEBUG STREQUAL ON) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-strict-aliasing") @@ -28,11 +18,11 @@ ENDIF(ENABLE_COVERAGE STREQUAL ON) IF(ENABLE_FRAME_POINTER STREQUAL ON) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer") -ENDIF(ENABLE_FRAME_POINTER STREQUAL ON) +ENDIF(ENABLE_FRAME_POINTER STREQUAL ON) IF(ENABLE_SSE STREQUAL ON) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.2") -ENDIF(ENABLE_SSE STREQUAL ON) +ENDIF(ENABLE_SSE STREQUAL ON) IF(NOT TEST_HDFS_PREFIX) SET(TEST_HDFS_PREFIX "./" CACHE STRING "default directory prefix used for test." FORCE) @@ -63,12 +53,12 @@ IF(CMAKE_COMPILER_IS_GNUCXX) IF(ENABLE_LIBCPP STREQUAL ON) MESSAGE(FATAL_ERROR "Unsupport using GCC compiler with libc++") ENDIF(ENABLE_LIBCPP STREQUAL ON) - + IF((GCC_COMPILER_VERSION_MAJOR EQUAL 4) AND (GCC_COMPILER_VERSION_MINOR EQUAL 4) AND OS_MACOSX) SET(NEED_GCCEH true CACHE INTERNAL "Explicitly link with gcc_eh") MESSAGE(STATUS "link with -lgcc_eh for TLS") ENDIF((GCC_COMPILER_VERSION_MAJOR EQUAL 4) AND (GCC_COMPILER_VERSION_MINOR EQUAL 4) AND OS_MACOSX) - + IF((GCC_COMPILER_VERSION_MAJOR LESS 4) OR ((GCC_COMPILER_VERSION_MAJOR EQUAL 4) AND (GCC_COMPILER_VERSION_MINOR LESS 4))) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") IF(NOT ENABLE_BOOST STREQUAL ON) @@ -88,14 +78,14 @@ IF(CMAKE_COMPILER_IS_GNUCXX) MESSAGE(STATUS "adding c++0x support for gcc compiler") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") ENDIF((GCC_COMPILER_VERSION_MAJOR LESS 4) OR ((GCC_COMPILER_VERSION_MAJOR EQUAL 4) AND (GCC_COMPILER_VERSION_MINOR LESS 4))) - + IF(NEED_BOOST) IF((Boost_MAJOR_VERSION LESS 1) OR ((Boost_MAJOR_VERSION EQUAL 1) AND (Boost_MINOR_VERSION LESS 50))) MESSAGE(FATAL_ERROR "boost 1.50+ is required") ENDIF() ELSE(NEED_BOOST) IF(HAVE_NANOSLEEP) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP") ELSE(HAVE_NANOSLEEP) MESSAGE(FATAL_ERROR "nanosleep() is required") ENDIF(HAVE_NANOSLEEP) @@ -141,7 +131,7 @@ TRY_COMPILE(HAVE_NESTED_EXCEPTION FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test.cpp "#include ") TRY_COMPILE(HAVE_BOOST_CHRONO ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/test.cpp + ${CMAKE_CURRENT_BINARY_DIR}/test.cpp CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'" -DINCLUDE_DIRECTORIES=${Boost_INCLUDE_DIR} OUTPUT_VARIABLE OUTPUT) @@ -149,21 +139,21 @@ TRY_COMPILE(HAVE_BOOST_CHRONO FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test.cpp "#include ") TRY_COMPILE(HAVE_STD_CHRONO ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/test.cpp + ${CMAKE_CURRENT_BINARY_DIR}/test.cpp CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'" OUTPUT_VARIABLE OUTPUT) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test.cpp "#include ") TRY_COMPILE(HAVE_BOOST_ATOMIC ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/test.cpp + ${CMAKE_CURRENT_BINARY_DIR}/test.cpp CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'" -DINCLUDE_DIRECTORIES=${Boost_INCLUDE_DIR} OUTPUT_VARIABLE OUTPUT) - + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test.cpp "#include ") TRY_COMPILE(HAVE_STD_ATOMIC ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/test.cpp + ${CMAKE_CURRENT_BINARY_DIR}/test.cpp CMAKE_FLAGS "-DCMAKE_CXX_LINK_EXECUTABLE='echo not linking now...'" OUTPUT_VARIABLE OUTPUT)