Repository: incubator-hawq Updated Branches: refs/heads/master f55cc6a34 -> ec16d3162
HAWQ-754. Hotfix for libhdfs3/libyarn test build Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/ec16d316 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/ec16d316 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/ec16d316 Branch: refs/heads/master Commit: ec16d3162eb1650a1c87d39b6b36ee11f7995954 Parents: f55cc6a Author: xunzhang <[email protected]> Authored: Thu May 26 14:48:58 2016 +0800 Committer: xunzhang <[email protected]> Committed: Thu May 26 14:48:58 2016 +0800 ---------------------------------------------------------------------- depends/libhdfs3/CMake/FindGoogleTest.cmake | 14 ++++++++------ depends/libhdfs3/CMakeLists.txt | 3 ++- depends/libyarn/CMake/FindGoogleTest.cmake | 14 ++++++++------ depends/libyarn/CMakeLists.txt | 3 ++- 4 files changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ec16d316/depends/libhdfs3/CMake/FindGoogleTest.cmake ---------------------------------------------------------------------- diff --git a/depends/libhdfs3/CMake/FindGoogleTest.cmake b/depends/libhdfs3/CMake/FindGoogleTest.cmake index 75053fd..fd57c1e 100644 --- a/depends/libhdfs3/CMake/FindGoogleTest.cmake +++ b/depends/libhdfs3/CMake/FindGoogleTest.cmake @@ -1,13 +1,13 @@ include(CheckCXXSourceRuns) -find_path(GoogleTest_INCLUDE_DIR gtest/gtest.h +find_path(GTest_INCLUDE_DIR gtest/gtest.h NO_DEFAULT_PATH PATHS "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/googletest/include" "/usr/local/include" "/usr/include") -find_path(GoogleMock_INCLUDE_DIR gmock/gmock.h +find_path(GMock_INCLUDE_DIR gmock/gmock.h NO_DEFAULT_PATH PATHS "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/googlemock/include" @@ -28,12 +28,12 @@ find_library(Gmock_LIBRARY "/usr/local/lib" "/usr/lib") -message(STATUS "Find GoogleTest include path: ${GoogleTest_INCLUDE_DIR}") -message(STATUS "Find GoogleMock include path: ${GoogleMock_INCLUDE_DIR}") +message(STATUS "Find GoogleTest include path: ${GTest_INCLUDE_DIR}") +message(STATUS "Find GoogleMock include path: ${GMock_INCLUDE_DIR}") message(STATUS "Find Gtest library path: ${Gtest_LIBRARY}") message(STATUS "Find Gmock library path: ${Gmock_LIBRARY}") -set(CMAKE_REQUIRED_INCLUDES ${GoogleTest_INCLUDE_DIR} ${GoogleMock_INCLUDE_DIR}) +set(CMAKE_REQUIRED_INCLUDES ${GTest_INCLUDE_DIR} ${GMock_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${Gtest_LIBRARY} ${Gmock_LIBRARY} -lpthread) set(CMAKE_REQUIRED_FLAGS) check_cxx_source_runs(" @@ -52,11 +52,13 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args( GoogleTest REQUIRED_VARS - GoogleTest_INCLUDE_DIR + GTest_INCLUDE_DIR + GMock_INCLUDE_DIR Gtest_LIBRARY Gmock_LIBRARY GoogleTest_CHECK_FINE) +set(GoogleTest_INCLUDE_DIR ${GTest_INCLUDE_DIR} ${GMock_INCLUDE_DIR}) set(GoogleTest_LIBRARIES ${Gtest_LIBRARY} ${Gmock_LIBRARY}) mark_as_advanced( GoogleTest_INCLUDE_DIR http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ec16d316/depends/libhdfs3/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/depends/libhdfs3/CMakeLists.txt b/depends/libhdfs3/CMakeLists.txt index 0700861..d787ed8 100644 --- a/depends/libhdfs3/CMakeLists.txt +++ b/depends/libhdfs3/CMakeLists.txt @@ -14,7 +14,6 @@ SET(DOXYFILE_PATH ${CMAKE_SOURCE_DIR}/docs) INCLUDE(Platform) INCLUDE(Functions) INCLUDE(Options) -INCLUDE_DIRECTORIES(${GoogleTest_INCLUDE_DIR}) FIND_PACKAGE(LibXml2 REQUIRED) @@ -22,6 +21,8 @@ FIND_PACKAGE(Protobuf REQUIRED) FIND_PACKAGE(KERBEROS REQUIRED) FIND_PACKAGE(GSasl REQUIRED) FIND_PACKAGE(GoogleTest REQUIRED) +INCLUDE_DIRECTORIES(${GoogleTest_INCLUDE_DIR}) +LINK_LIBRARIES(${GoogleTest_LIBRARIES}) IF(OS_LINUX) FIND_PACKAGE(LibUUID REQUIRED) http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ec16d316/depends/libyarn/CMake/FindGoogleTest.cmake ---------------------------------------------------------------------- diff --git a/depends/libyarn/CMake/FindGoogleTest.cmake b/depends/libyarn/CMake/FindGoogleTest.cmake index 75053fd..fd57c1e 100644 --- a/depends/libyarn/CMake/FindGoogleTest.cmake +++ b/depends/libyarn/CMake/FindGoogleTest.cmake @@ -1,13 +1,13 @@ include(CheckCXXSourceRuns) -find_path(GoogleTest_INCLUDE_DIR gtest/gtest.h +find_path(GTest_INCLUDE_DIR gtest/gtest.h NO_DEFAULT_PATH PATHS "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/googletest/include" "/usr/local/include" "/usr/include") -find_path(GoogleMock_INCLUDE_DIR gmock/gmock.h +find_path(GMock_INCLUDE_DIR gmock/gmock.h NO_DEFAULT_PATH PATHS "${PROJECT_SOURCE_DIR}/../thirdparty/googletest/googlemock/include" @@ -28,12 +28,12 @@ find_library(Gmock_LIBRARY "/usr/local/lib" "/usr/lib") -message(STATUS "Find GoogleTest include path: ${GoogleTest_INCLUDE_DIR}") -message(STATUS "Find GoogleMock include path: ${GoogleMock_INCLUDE_DIR}") +message(STATUS "Find GoogleTest include path: ${GTest_INCLUDE_DIR}") +message(STATUS "Find GoogleMock include path: ${GMock_INCLUDE_DIR}") message(STATUS "Find Gtest library path: ${Gtest_LIBRARY}") message(STATUS "Find Gmock library path: ${Gmock_LIBRARY}") -set(CMAKE_REQUIRED_INCLUDES ${GoogleTest_INCLUDE_DIR} ${GoogleMock_INCLUDE_DIR}) +set(CMAKE_REQUIRED_INCLUDES ${GTest_INCLUDE_DIR} ${GMock_INCLUDE_DIR}) set(CMAKE_REQUIRED_LIBRARIES ${Gtest_LIBRARY} ${Gmock_LIBRARY} -lpthread) set(CMAKE_REQUIRED_FLAGS) check_cxx_source_runs(" @@ -52,11 +52,13 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args( GoogleTest REQUIRED_VARS - GoogleTest_INCLUDE_DIR + GTest_INCLUDE_DIR + GMock_INCLUDE_DIR Gtest_LIBRARY Gmock_LIBRARY GoogleTest_CHECK_FINE) +set(GoogleTest_INCLUDE_DIR ${GTest_INCLUDE_DIR} ${GMock_INCLUDE_DIR}) set(GoogleTest_LIBRARIES ${Gtest_LIBRARY} ${Gmock_LIBRARY}) mark_as_advanced( GoogleTest_INCLUDE_DIR http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/ec16d316/depends/libyarn/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/depends/libyarn/CMakeLists.txt b/depends/libyarn/CMakeLists.txt index e323472..e7719d4 100644 --- a/depends/libyarn/CMakeLists.txt +++ b/depends/libyarn/CMakeLists.txt @@ -15,13 +15,14 @@ SET(DOXYFILE_PATH ${CMAKE_SOURCE_DIR}/docs) INCLUDE(Platform) INCLUDE(Functions) INCLUDE(Options) -INCLUDE_DIRECTORIES(${GoogleTest_INCLUDE_DIR}) FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(Protobuf REQUIRED) FIND_PACKAGE(KERBEROS REQUIRED) FIND_PACKAGE(GSasl REQUIRED) FIND_PACKAGE(GoogleTest REQUIRED) +INCLUDE_DIRECTORIES(${GoogleTest_INCLUDE_DIR}) +LINK_LIBRARIES(${GoogleTest_LIBRARIES}) ADD_SUBDIRECTORY(mock) ADD_SUBDIRECTORY(src)
