Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapted to biicode via biicode.conf, ignore.bii and CMakeLists.txt #104

Merged
merged 1 commit into from
Feb 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,24 @@ os:
- osx

before_install:
- if [ $TRAVIS_OS_NAME == osx ]; then curl http://www.cmake.org/files/v2.8/cmake-2.8.12.2-Darwin64-universal.tar.gz -o cmake.tar.gz; fi
- if [ $TRAVIS_OS_NAME == osx ]; then curl http://www.cmake.org/files/v3.0/cmake-3.0.2-Darwin64-universal.tar.gz -o cmake.tar.gz; fi
- if [ $TRAVIS_OS_NAME == osx ]; then tar xzf cmake.tar.gz; fi
- if [ $TRAVIS_OS_NAME == osx ]; then export PATH=$PATH:"cmake-2.8.12.2-Darwin64-universal/CMake 2.8-12.app/Contents/bin"; fi
- if [ $TRAVIS_OS_NAME == osx ]; then export PATH=$PATH:"cmake-3.0.2-Darwin64-universal/CMake.app/Contents/bin"; fi
- git submodule update --init

env:
- BUILD_TYPE=Debug
- BUILD_TYPE=Release

script:
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DFMT_EXTRA_TESTS=ON .
- mkdir build && cd build
- cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DFMT_EXTRA_TESTS=ON ..
- make -j4
- CTEST_OUTPUT_ON_FAILURE=1 make test
- cd .. && rm -rf build/
# Building with biicode
- ./biicode/support/travis-build.sh


after_failure:
- cat Testing/Temporary/LastTest.log
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ if (CPP11_FLAG)
set(CMAKE_REQUIRED_FLAGS ${CPP11_FLAG})
endif ()

if(BIICODE)
include(biicode/cmake/biicode.cmake)
return()
endif(BIICODE)

add_library(format ${FMT_SOURCES})
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(format PROPERTIES COMPILE_FLAGS
Expand Down
16 changes: 16 additions & 0 deletions biicode.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Biicode configuration file

[paths]
# Local directories to look for headers (within block)
/

[dependencies]
# Manual adjust file implicit dependencies, add (+), remove (-), or overwrite (=)
CMakeLists.txt + cmake/FindSetEnv.cmake
format.h = format.cc
format.cc - test/* posix.cc
biicode/samples/basic.cpp - test/*

[mains]
# Manual adjust of files that define an executable
!test/test-main.cc
18 changes: 18 additions & 0 deletions biicode/cmake/biicode.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Initializes block variables
INIT_BIICODE_BLOCK()

# Actually create targets: EXEcutables and libraries.
ADD_BIICODE_TARGETS()

target_include_directories(${BII_BLOCK_TARGET} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

if (HAVE_OPEN)
target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DFMT_USE_FILE_DESCRIPTORS=1)
endif ()

if (CMAKE_COMPILER_IS_GNUCXX)
target_compile_options(${BII_BLOCK_TARGET} INTERFACE -Wall -Wextra -Wshadow -pedantic)
endif ()
if (CPP11_FLAG AND FMT_EXTRA_TESTS)
target_compile_options(${BII_BLOCK_TARGET} INTERFACE ${CPP11_FLAG})
endif ()
18 changes: 18 additions & 0 deletions biicode/samples/basic.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#include "vitaut/cppformat/format.h"

class Date {
int year_, month_, day_;
public:
Date(int year, int month, int day) : year_(year), month_(month), day_(day) {}

friend std::ostream &operator<<(std::ostream &os, const Date &d) {
return os << d.year_ << '-' << d.month_ << '-' << d.day_;
}
};

int main(int argc, char *argv[]){
std::string s = fmt::format("The date is {}", Date(2012, 12, 9));
fmt::print("Hello, {}!", "world"); // uses Python-like format string syntax
fmt::printf("\n%s", s); // uses printf format string syntax
return 0;
}
30 changes: 30 additions & 0 deletions biicode/support/travis-build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash

if [ $TRAVIS_OS_NAME == linux ]; then
sudo apt-get install libglu1-mesa-dev xorg-dev
wget http://www.biicode.com/downloads/latest/ubuntu64
mv ubuntu64 bii-ubuntu64.deb
(sudo dpkg -i bii-ubuntu64.deb) && sudo apt-get -f install
rm bii-ubuntu64.deb
wget https://s3.amazonaws.com/biibinaries/thirdparty/cmake-3.0.2-Linux-64.tar.gz
tar -xzf cmake-3.0.2-Linux-64.tar.gz
sudo cp -fR cmake-3.0.2-Linux-64/* /usr
rm -rf cmake-3.0.2-Linux-64
rm cmake-3.0.2-Linux-64.tar.gz
elif [ $TRAVIS_OS_NAME == osx ]; then
wget http://www.biicode.com/downloads/latest/macos
mv macos macos.pkg
sudo installer -pkg macos.pkg -target /
rm macos.pkg
fi

cmake --version
bii init biicode_project
mkdir -p ./biicode_project/blocks/vitaut/cppformat
shopt -s extglob
mv !(biicode_project|cmake-3.0.2-Darwin64-universal) ./biicode_project/blocks/vitaut/cppformat
cd biicode_project
bii cpp:build
ls bin/*
./bin/vitaut_cppformat_biicode_samples_basic

3 changes: 3 additions & 0 deletions ignore.bii
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
doc/*
breathe/*
gmock/*