Skip to content

Commit

Permalink
Merge pull request #14 from elucideye/pr.rm.submodules.fix.libcxx
Browse files Browse the repository at this point in the history
GIT_SUBMODULE to standard hunter package; add clang/libc++ toolchain …
  • Loading branch information
headupinclouds authored Aug 17, 2017
2 parents 686cd71 + 987e59e commit 1021f11
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 7 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "src/3rdparty/xgboost"]
path = src/3rdparty/xgboost
url = https://github.com/hunter-packages/xgboost.git
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ addons:
apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-3.8
packages:
- python3

Expand All @@ -28,6 +29,13 @@ addons:
# https://github.com/travis-ci-tester/travis-test-clang-cxx-11
- libstdc++-4.8-dev

- clang-3.8
- libc++-dev
- libc++abi-dev
- libclang-3.8-dev
- libclang-common-3.8-dev
- libclang1-3.8

# https://github.com/travis-ci-tester/travis-test-gcc-cxx-11
- g++-4.8

Expand All @@ -39,6 +47,8 @@ addons:
matrix:
include:
# Linux {
- os: linux
env: CONFIG=Release TOOLCHAIN=libcxx INSTALL=--strip TO_STRING=OFF
- os: linux
env: CONFIG=Release TOOLCHAIN=gcc-4-8-pic-hid-sections INSTALL=--strip TO_STRING=OFF
# - os: linux
Expand Down Expand Up @@ -82,6 +92,12 @@ before_install:
# Add '--quiet' to avoid leaking the token to logs
- git submodule update --init --recursive --quiet

# Use a recent clang
# - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.8 380; fi
# - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.8 380; fi

- if [[ $TRAVIS_OS_NAME == 'linux' ]]; then mkdir -p latest-clang-symlinks && ln -s /usr/bin/clang-3.8 latest-clang-symlinks/clang && ln -s /usr/bin/clang++-3.8 latest-clang-symlinks/clang++ && export PATH="$PWD/latest-clang-symlinks:$PATH"; fi

install:
# Info about OS
- uname -a
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ cmake_minimum_required(VERSION 3.3)
include("cmake/HunterGate.cmake")

HunterGate(
URL "https://github.com/ruslo/hunter/archive/v0.19.68.tar.gz"
SHA1 "ad0d042d8ec56a3c6a4bda1e657f1f65b494ab12"
URL "https://github.com/ruslo/hunter/archive/v0.19.72.tar.gz"
SHA1 "3ed5ea39abf52afab06c77e1b7d7e41e939752f1"
FILEPATH "${CMAKE_CURRENT_LIST_DIR}/cmake/Hunter/config.cmake"
)

Expand Down
2 changes: 1 addition & 1 deletion cmake/Hunter/config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set(XGBOOST_CMAKE_ARGS
XGBOOST_USE_CEREAL=${XGBOOSTER_SERIALIZE_WITH_CEREAL}
)

hunter_config(xgboost GIT_SUBMODULE "src/3rdparty/xgboost" CMAKE_ARGS ${XGBOOST_CMAKE_ARGS})
hunter_config(xgboost VERSION ${HUNTER_xgboost_VERSION} CMAKE_ARGS ${XGBOOST_CMAKE_ARGS})
1 change: 0 additions & 1 deletion src/3rdparty/xgboost
Submodule xgboost deleted from 070e93

0 comments on commit 1021f11

Please sign in to comment.