Skip to content

Commit

Permalink
Merge pull request #6 from rdeits/cmakewrapper
Browse files Browse the repository at this point in the history
try to use CMakeWrapper build process
rdeits authored Mar 6, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 8339fd6 + 59d867a commit 5a48f11
Showing 3 changed files with 6 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@ os:
- osx
julia:
- 0.5
- 0.6
- nightly
notifications:
email: false
branches:
only:
- master

after_success:
- julia -e 'cd(Pkg.dir("LCMCore")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
julia 0.5
BinDeps 0.4.0
@osx Homebrew 0.3.0
CMakeWrapper 0.0.1
24 changes: 4 additions & 20 deletions deps/build.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using BinDeps
using CMakeWrapper

@BinDeps.setup

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

lcm_builddir = joinpath(BinDeps.depsdir(lcm), "builds", "lcm")
lcm_srcdir = joinpath(BinDeps.depsdir(lcm), "src", lcm_folder)
lcm_cmake_command = `cmake -DCMAKE_INSTALL_PREFIX=$(prefix)`
for arg in lcm_cmake_arguments
lcm_cmake_command = `$lcm_cmake_command $arg`
end
lcm_cmake_command = `$lcm_cmake_command $lcm_srcdir`

provides(BuildProcess,
(@build_steps begin
GetSources(lcm)
CreateDirectory(lcm_builddir)
@build_steps begin
ChangeDirectory(lcm_builddir)
lcm_cmake_command
`cmake --build . --target install`
end
end),
lcm,
onload="""
provides(BuildProcess, CMakeProcess(cmake_args=lcm_cmake_arguments),
lcm,
onload="""
const lcm_prefix = "$prefix"
""")

0 comments on commit 5a48f11

Please sign in to comment.