diff options
| -rw-r--r-- | .travis.yml | 11 | ||||
| m--------- | doc/html | 8 | ||||
| -rw-r--r-- | include/afio/revision.hpp | 6 | ||||
| -rw-r--r-- | programs/CMakeLists.txt | 10 |
4 files changed, 27 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 8b3590e1..d66002a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,7 @@ addons: env: - __="cmake tests" NAME=TravisLinuxWorker - __="Documentation" NAME=TravisDocumentation + - __="Programs" matrix: exclude: @@ -90,6 +91,16 @@ script: git push -f https://jenkins-nedprod:$JENKINS_NEDPROD_PASSWORD@github.com/ned14/boost.afio gh-pages; cd ../..; fi + - + if [ "$__" = "Programs" ]; then + if [ "$CXX" = "g++" ]; then export CXX=g++-7; export NAME=TravisLinuxWorkerGCC; fi; + if [ "$CXX" = "clang++" ]; then export CXX=clang++-4.0; export NAME=TravisLinuxWorkerClang; fi; + cd programs; + mkdir build; + cd build; + cmake ..; + cmake --build .; + fi after_success: # - bash -x ./update_coveralls.sh `pwd` diff --git a/doc/html b/doc/html -Subproject 68a28b7a3426d8b43b745a30c2b781809432d80 +Subproject 8b2f459e8b4fb975e8be3a82f9e2ae7eede7a93 diff --git a/include/afio/revision.hpp b/include/afio/revision.hpp index 46933f32..4281d350 100644 --- a/include/afio/revision.hpp +++ b/include/afio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define AFIO_PREVIOUS_COMMIT_REF 0c8f416d674e27ab2edfe1f1d045d4646abf7d78 -#define AFIO_PREVIOUS_COMMIT_DATE "2017-08-16 22:08:53 +00:00" -#define AFIO_PREVIOUS_COMMIT_UNIQUE 0c8f416d +#define AFIO_PREVIOUS_COMMIT_REF 0bb001d4c854e36739b3b9cddbf183edc5982632 +#define AFIO_PREVIOUS_COMMIT_DATE "2017-08-16 23:58:07 +00:00" +#define AFIO_PREVIOUS_COMMIT_UNIQUE 0bb001d4 diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index e6695bf9..7460d847 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -14,7 +14,15 @@ endif() function(make_program program) add_executable(${program} "${program}/main.cpp") - target_include_directories(${program} PRIVATE ..) + # Hack for sibling config + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../.quickcpplib_use_siblings") + target_include_directories(${program} PRIVATE "../..") + target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings") + target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings/a") + target_include_directories(${program} PRIVATE "../../.quickcpplib_use_siblings/a/a") + else() + target_include_directories(${program} PRIVATE "test") + endif() if(WIN32) target_compile_definitions(${program} PRIVATE _UNICODE UNICODE) # cmake's support for LLVM clang is shocking :( |