File tree 4 files changed +19
-15
lines changed
4 files changed +19
-15
lines changed Original file line number Diff line number Diff line change @@ -304,3 +304,6 @@ $RECYCLE.BIN/
304
304
.vagrant /
305
305
tmp /
306
306
.influxdb
307
+ conanpremake.lua
308
+ conanbuildinfo.txt
309
+ conaninfo.txt
Original file line number Diff line number Diff line change @@ -15,23 +15,21 @@ addons:
15
15
- g++-5
16
16
- wget
17
17
- libboost1.55-all-dev
18
+ - python-pip
18
19
19
20
cache :
20
21
- apt
21
22
22
23
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
30
29
- wget https://dl.influxdata.com/influxdb/releases/influxdb-1.2.4_linux_amd64.tar.gz
31
30
- tar xvfz influxdb-1.2.4_linux_amd64.tar.gz
32
- # - 'brew install influxdb'
31
+ - premake/premake5-64 gmake
33
32
34
33
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
37
35
- /bin/bash -c "./src/script/test.sh bin/linux/gmake/x64/Release"
Original file line number Diff line number Diff line change
1
+ [requires]
2
+ [email protected] @memsharded/testing
3
+ cpprestsdk/2.10.2@bincrafters/stable
4
+
5
+ [generators]
6
+ Premake
Original file line number Diff line number Diff line change @@ -18,7 +18,6 @@ filter 'system:linux'
18
18
filter {}
19
19
20
20
-- linuxbrew
21
- local cpprestsdk_root_linux = ' /home/linuxbrew/.linuxbrew/Cellar/cpprestsdk/2.9.1'
22
21
local cpprestsdk_root_mac = ' ~/.linuxbrew/Cellar/cpprestsdk/2.9.1'
23
22
24
23
filter ' system:macosx'
@@ -35,10 +34,8 @@ filter 'system:linux' -- conan install .
35
34
includedirs {
36
35
cpprestsdk_root_linux .. ' /include' -- via linuxbrew: brew install gcc cmake cpprestsdk
37
36
}
38
- libdirs {
39
- cpprestsdk_root_linux .. ' /lib' ,
40
- ' /home/linuxbrew/.linuxbrew/lib64' ,
41
- }
37
+ libdirs { conan_libdirs }
38
+ links { conan_libs }
42
39
filter {}
43
40
44
41
function default_links ()
You can’t perform that action at this time.
0 commit comments