Skip to content

Commit

Permalink
clean up glog
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Gauci committed Mar 6, 2018
1 parent 05f402d commit a31af34
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 96 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ before_install:
- uname -a
- git submodule update --init --recursive
- sudo apt-get update -qq
- sudo apt-get install -y cmake protobuf-compiler libsodium-dev libgoogle-glog-dev libgflags-dev libprotobuf-dev libutempter-dev
- sudo apt-get install -y cmake protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev

branches:
only:
Expand Down
36 changes: 0 additions & 36 deletions CHANGELOG.md

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ Install dependencies:
Debian:

sudo apt-get install libboost-dev libsodium-dev libncurses5-dev \
libprotobuf-dev protobuf-compiler cmake libgoogle-glog-dev \
libprotobuf-dev protobuf-compiler cmake \
libgflags-dev unzip wget

Fedora (tested on 25):

sudo dnf install boost-devel libsodium-devel ncurses-devel protobuf-devel \
protobuf-compiler cmake glog-devel gflags-devel wget unzip
protobuf-compiler cmake gflags-devel wget unzip

Gentoo:

sudo emerge dev-libs/boost dev-libs/libsodium sys-libs/ncurses \
dev-libs/protobuf dev-util/cmake dev-cpp/glog dev-cpp/gflags \
dev-libs/protobuf dev-util/cmake dev-cpp/gflags \
net-misc/wget app-arch/unzip

Download and install from source:
Expand Down Expand Up @@ -130,7 +130,7 @@ make
Grab the deps and then follow the same process as for OS/X:

```
sudo apt install libsodium-dev, libncurses5-dev, libprotobuf-dev, protobuf-compiler, cmake, libgoogle-glog-dev, libgflags-dev, libutempter-dev
sudo apt install libsodium-dev, libncurses5-dev, libprotobuf-dev, protobuf-compiler, cmake, libgflags-dev, libutempter-dev
git clone https://github.com/MisterTea/EternalTerminal.git
cd EternalTerminal
mkdir build
Expand Down
7 changes: 0 additions & 7 deletions build_static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,12 @@ cd libtool-2.4.6
make -j8 install
cd .. || exit
git clone https://github.com/gflags/gflags.git
git clone https://github.com/google/glog.git
git clone https://github.com/jedisct1/libsodium.git
git clone https://github.com/google/protobuf.git
cd gflags || exit
git checkout v2.2.0
cmake -DCMAKE_INSTALL_PREFIX="$PWD"/../out -DBUILD_SHARED_LIBS=OFF ./
make -j8 install
cd ../glog || exit
git checkout v0.3.5
cmake -DCMAKE_INSTALL_PREFIX="$PWD"/../out -DWITH_GFLAGS=ON -DWITH_THREADS=ON -Dgflags_DIR="$PWD"../out/lib/cmake/gflags ./
make -j8 install
cd ../protobuf || exit
git checkout v3.4.1
cmake -DCMAKE_INSTALL_PREFIX="$PWD"/../out -Dprotobuf_BUILD_TESTS=OFF ./cmake
Expand All @@ -56,8 +51,6 @@ cd ../../build || exit
cmake \
-DGFLAGS_INCLUDE_DIR="$PWD"/../deps/out/include \
-DGFLAGS_LIBRARY="$PWD"/../deps/out/lib/libgflags.a \
-DGLOG_INCLUDE_DIR="$PWD"/../deps/out/include \
-DGLOG_LIBRARY="$PWD"/../deps/out/lib/libglog.a \
-DProtobuf_INCLUDE_DIR="$PWD"/../deps/out/include \
-DProtobuf_LIBRARY_DEBUG="$PWD"/../deps/out/lib/libprotobuf.a \
-DProtobuf_LIBRARY_RELEASE="$PWD"/../deps/out/lib/libprotobuf.a \
Expand Down
48 changes: 0 additions & 48 deletions cmake/FindGlog.cmake

This file was deleted.

0 comments on commit a31af34

Please sign in to comment.