Skip to content

Commit 77b7e16

Browse files
committed
trying conan for linux
1 parent 987b6ce commit 77b7e16

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -304,3 +304,6 @@ $RECYCLE.BIN/
304304
.vagrant/
305305
tmp/
306306
.influxdb
307+
conanpremake.lua
308+
conanbuildinfo.txt
309+
conaninfo.txt

.travis.yml

+8-10
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,21 @@ addons:
1515
- g++-5
1616
- wget
1717
- libboost1.55-all-dev
18+
- python-pip
1819

1920
cache:
2021
- apt
2122

2223
install:
23-
- echo -ne "\n" | ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Linuxbrew/install/master/install)"
24-
- export PATH="/home/linuxbrew/.linuxbrew/bin:$PATH"
25-
- export CXX="g++-5"
26-
- brew update
27-
- brew install patchelf zlib binutils linux-headers glibc xz gmp mpfr libmpc isl gcc bzip2 boost makedepend openssl pkg-config curl libidn cmake || true
28-
- brew postinstall gcc || true
29-
- brew install --verbose cpprestsdk
24+
- pip install conan
25+
- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
26+
- git clone https://github.com/memsharded/conan-premake.git
27+
- cd conan-premake && conan export . memsharded/testing
28+
- conan install . --build PremakeGen --build=missing
3029
- wget https://dl.influxdata.com/influxdb/releases/influxdb-1.2.4_linux_amd64.tar.gz
3130
- tar xvfz influxdb-1.2.4_linux_amd64.tar.gz
32-
# - 'brew install influxdb'
31+
- premake/premake5-64 gmake
3332

3433
script:
35-
# - "ls ~/.linuxbrew/Cellar/*"
36-
- make -C build/linux/gmake config=release_x64
34+
- CXX="g++-5" make -C build/linux/gmake config=release_x64
3735
- /bin/bash -c "./src/script/test.sh bin/linux/gmake/x64/Release"

conanfile.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[requires]
2+
[email protected]@memsharded/testing
3+
cpprestsdk/2.10.2@bincrafters/stable
4+
5+
[generators]
6+
Premake

premake5.lua

+2-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ filter 'system:linux'
1818
filter {}
1919

2020
--linuxbrew
21-
local cpprestsdk_root_linux = '/home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1'
2221
local cpprestsdk_root_mac = '~/.linuxbrew/Cellar/cpprestsdk/2.9.1'
2322

2423
filter 'system:macosx'
@@ -35,10 +34,8 @@ filter 'system:linux' -- conan install .
3534
includedirs {
3635
cpprestsdk_root_linux..'/include' --via linuxbrew: brew install gcc cmake cpprestsdk
3736
}
38-
libdirs {
39-
cpprestsdk_root_linux..'/lib',
40-
'/home/linuxbrew/.linuxbrew/lib64',
41-
}
37+
libdirs { conan_libdirs }
38+
links { conan_libs }
4239
filter {}
4340

4441
function default_links()

0 commit comments

Comments
 (0)