Skip to content

Commit 5a48f11

Browse files
authored
Merge pull request #6 from rdeits/cmakewrapper
try to use CMakeWrapper build process
2 parents 8339fd6 + 59d867a commit 5a48f11

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ os:
66
- osx
77
julia:
88
- 0.5
9+
- 0.6
910
- nightly
1011
notifications:
1112
email: false
1213
branches:
1314
only:
1415
- master
15-
1616
after_success:
1717
- julia -e 'cd(Pkg.dir("LCMCore")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

REQUIRE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
julia 0.5
22
BinDeps 0.4.0
33
@osx Homebrew 0.3.0
4+
CMakeWrapper 0.0.1

deps/build.jl

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using BinDeps
2+
using CMakeWrapper
23

34
@BinDeps.setup
45

@@ -55,26 +56,9 @@ provides(Sources,
5556
lcm,
5657
unpacked_dir=lcm_folder)
5758

58-
lcm_builddir = joinpath(BinDeps.depsdir(lcm), "builds", "lcm")
59-
lcm_srcdir = joinpath(BinDeps.depsdir(lcm), "src", lcm_folder)
60-
lcm_cmake_command = `cmake -DCMAKE_INSTALL_PREFIX=$(prefix)`
61-
for arg in lcm_cmake_arguments
62-
lcm_cmake_command = `$lcm_cmake_command $arg`
63-
end
64-
lcm_cmake_command = `$lcm_cmake_command $lcm_srcdir`
65-
66-
provides(BuildProcess,
67-
(@build_steps begin
68-
GetSources(lcm)
69-
CreateDirectory(lcm_builddir)
70-
@build_steps begin
71-
ChangeDirectory(lcm_builddir)
72-
lcm_cmake_command
73-
`cmake --build . --target install`
74-
end
75-
end),
76-
lcm,
77-
onload="""
59+
provides(BuildProcess, CMakeProcess(cmake_args=lcm_cmake_arguments),
60+
lcm,
61+
onload="""
7862
const lcm_prefix = "$prefix"
7963
""")
8064

0 commit comments

Comments
 (0)