IMPALA-3223: Relocate squeasel and mustache directories

This change moves the source and header files of squeasel
and mustache to be/src/thirdparty. This is a step towards
removing thirdparty as a preparation to move to ASF.

There is also corresponding change to Impala-lzo to update
its include path.

Change-Id: I782e493bc28086a1587274b3c474ea6b6f201855
Reviewed-on: http://gerrit.cloudera.org:8080/3206
Reviewed-by: Michael Ho <kwho@cloudera.com>
Tested-by: Michael Ho <kwho@cloudera.com>

CMakeLists.txt

@@ -191,14 +191,6 @@ else()
   set(HDFS_LIB HDFS_STATIC)
 endif()
 
-# find the Squeasel webserver library
-find_package(Squeasel REQUIRED)
-include_directories(${SQUEASEL_INCLUDE_DIR})
-
-# find the Mustache template library
-find_package(Mustache REQUIRED)
-include_directories(${MUSTACHE_INCLUDE_DIR})
-
 # find GLog headers and libs.  Must include glog headers before the other
 # google libraries.  They all have a config.h and we want glog's to be picked
 # up first.

be/src/util/CMakeLists.txt

@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set(SQUEASEL_SRC_DIR "${CMAKE_SOURCE_DIR}/be/src/thirdparty/squeasel")
+set(MUSTACHE_SRC_DIR "${CMAKE_SOURCE_DIR}/be/src/thirdparty/mustache")
+
 # Without this option Squeasel looks up the SSL library at run-time
 # and may not guess the correct name on some distributions
 SET_SOURCE_FILES_PROPERTIES(${SQUEASEL_SRC_DIR}/squeasel.c PROPERTIES

be/src/util/webserver.cc

@@ -20,18 +20,19 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/mem_fn.hpp>
 #include <boost/thread/locks.hpp>
+#include <fstream>
 #include <gutil/strings/substitute.h>
 #include <map>
-#include <fstream>
 #include <stdio.h>
 #include <signal.h>
 #include <string>
-#include <mustache/mustache.h>
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/prettywriter.h>
 
-#include "util/asan.h"
 #include "common/logging.h"
+#include "rpc/thrift-util.h"
+#include "thirdparty/mustache/mustache.h"
+#include "util/asan.h"
 #include "util/cpu-info.h"
 #include "util/disk-info.h"
 #include "util/mem-info.h"
@@ -42,7 +43,6 @@
 #include "util/debug-util.h"
 #include "util/pretty-printer.h"
 #include "util/stopwatch.h"
-#include "rpc/thrift-util.h"
 
 #include "common/names.h"
 

be/src/util/webserver.h

@@ -16,14 +16,14 @@
 #ifndef IMPALA_UTIL_WEBSERVER_H
 #define IMPALA_UTIL_WEBSERVER_H
 
-#include <squeasel/squeasel.h>
-#include <string>
-#include <map>
 #include <boost/function.hpp>
 #include <boost/thread/shared_mutex.hpp>
+#include <map>
 #include <rapidjson/document.h>
+#include <string>
 
 #include "common/status.h"
+#include "thirdparty/squeasel/squeasel.h"
 #include "util/network-util.h"
 
 namespace impala {