diff options
| author | James Rowe <jroweboy@gmail.com> | 2018-01-15 20:53:53 -0700 |
|---|---|---|
| committer | James Rowe <jroweboy@gmail.com> | 2018-01-16 01:15:52 -0700 |
| commit | e026b66bbbb78f3c43c067eb94675d4782fb70b6 (patch) | |
| tree | d64dd737b71c7845c92b598c3e2aee4314343537 /.travis/macos/build.sh | |
| parent | 713c1ed2037e73d3eadcc605c839f069aefc4853 (diff) | |
Build: Add unicorn as a submodule and build it if needed
Adds a cmake custom target that will build unicorn on first compile and
uses this in the build scripts as well. Updates Appveyor and Travis
build scripts to work with the new unicorn build, and updates the paths
to all of the different artifacts.
Diffstat (limited to '.travis/macos/build.sh')
| -rwxr-xr-x | .travis/macos/build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index e1c54af55..177e8ac3b 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -8,7 +8,7 @@ export UNICORNDIR=$(pwd)/externals/unicorn mkdir build && cd build cmake --version -cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;x86_64h" -DCMAKE_BUILD_TYPE=Release +cmake .. -DYUZU_BUILD_UNICORN=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;x86_64h" -DCMAKE_BUILD_TYPE=Release make -j4 ctest -VV -C Release |