Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: .travis.yml
2025-12-07 17:26:55 +08:00 · 2014-03-10 14:31:58 -06:00 · 2014-03-10 14:31:58 -06:00 · b0a882d57e
commit b0a882d57e
parent 8b134c65d1 d22fb19e0e
1 changed files with 2 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,8 @@ compiler:
 script: 
  - mkdir build
  - cd build
-  - cmake ../build
+  - cmake ../
+  - make
  - make test
 notifications:
  recipients: