move external files to external

MisterTea · Jan 4, 2019 · 320cb19 · 320cb19
1 parent a1b8711
commit 320cb19
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -93,6 +93,7 @@ ELSE()
 ENDIF()
 
 include_directories(
+  external
   src/base
   src/terminal
   src/htm
@@ -110,6 +111,8 @@ add_library(
   et-lib
   STATIC
 
+  external/easylogging++.cc
+
   src/base/BackedReader.cpp
   src/base/BackedWriter.cpp
   src/base/ClientConnection.cpp
@@ -121,7 +124,6 @@ add_library(
   src/base/PipeSocketHandler.cpp
   src/base/TcpSocketHandler.cpp
   src/base/UnixSocketHandler.cpp
-  src/base/easylogging++.cc
   src/base/LogHandler.cpp
   src/base/DaemonCreator.cpp
   src/base/SystemUtils.cpp

diff --git a/coverage.sh b/coverage.sh
@@ -1,13 +1,17 @@
+rm -Rf build
+mkdir build
 pushd ./build
-cmake ../ -DBUILD_TEST=ON -DBUILD_GTEST=ON -DCODE_COVERAGE=ON
-make -j8
+cmake ../ -DBUILD_TEST=ON -DBUILD_GTEST=ON -DCODE_COVERAGE=ON -G Ninja
+ninja
 find . -name "*.gcda" -print0 | xargs -0 rm
 popd
 ./build/test/et-test
 lcov --directory ./build --capture --output-file ./code-coverage.info -rc lcov_branch_coverage=1
 genhtml code-coverage.info --branch-coverage --output-directory ./code_coverage_report/
 echo "Report generated in code_coverage_report"
 open code_coverage_report/index.html
+rm -Rf build
+mkdir build
 pushd ./build
-cmake ../ -DBUILD_TEST=ON -DBUILD_GTEST=ON -DCODE_COVERAGE=OFF
+cmake ../ -DBUILD_TEST=ON -DBUILD_GTEST=ON -DCODE_COVERAGE=OFF -G Ninja
 popd
diff --git a/src/base/ctpl_stl.h → external/ctpl_stl.h b/src/base/ctpl_stl.h → external/ctpl_stl.h
diff --git a/src/base/easylogging++.cc → external/easylogging++.cc b/src/base/easylogging++.cc → external/easylogging++.cc
diff --git a/src/base/easylogging++.h → external/easylogging++.h b/src/base/easylogging++.h → external/easylogging++.h