Fixed the include path for farmhash.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/79bfcf9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/79bfcf9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/79bfcf9e Branch: refs/heads/trace Commit: 79bfcf9ed294477a24823b00bd814df0de54ee5e Parents: b5130fe Author: Zuyu Zhang <[email protected]> Authored: Fri Oct 13 16:07:51 2017 -0500 Committer: Zuyu Zhang <[email protected]> Committed: Fri Oct 13 16:07:51 2017 -0500 ---------------------------------------------------------------------- CMakeLists.txt | 1 + types/TypedValue.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/79bfcf9e/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index e0d020b..071f8fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -635,6 +635,7 @@ endif() # Add required cmake-controlled third-party libraries (farmhash, gflags, glog, and re2). add_subdirectory ("${THIRD_PARTY_SOURCE_DIR}/farmhash" "${CMAKE_CURRENT_BINARY_DIR}/third_party/farmhash") +include_directories("${THIRD_PARTY_SOURCE_DIR}") add_subdirectory ("${THIRD_PARTY_SOURCE_DIR}/gflags" "${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags") include_directories("${CMAKE_CURRENT_BINARY_DIR}/third_party/gflags/include") http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/79bfcf9e/types/TypedValue.hpp ---------------------------------------------------------------------- diff --git a/types/TypedValue.hpp b/types/TypedValue.hpp index 0ba3d53..3075061 100644 --- a/types/TypedValue.hpp +++ b/types/TypedValue.hpp @@ -34,7 +34,7 @@ #include "utility/HashPair.hpp" #include "utility/Macros.hpp" -#include "third_party/src/farmhash/farmhash.h" +#include "farmhash/farmhash.h" #include "glog/logging.h"
