Skip to content

Commit ec4b883

Browse files
eakralyeakraly
committed
Merge pull request google#2 from cpp-netlib/0.11-devel
Update from cpp-netlib
2 parents a59ed53 + 3229d2a commit ec4b883

File tree

343 files changed

+29595
-20081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

343 files changed

+29595
-20081
lines changed

‎.clang-format

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
BasedOnStyle: Google
2+
AccessModifierOffset: -1
3+
ConstructorInitializerIndentWidth: 4
4+
AlignEscapedNewlinesLeft: true
5+
AlignTrailingComments: true
6+
AllowAllParametersOfDeclarationOnNextLine: true
7+
AllowShortIfStatementsOnASingleLine: true
8+
AllowShortLoopsOnASingleLine: true
9+
AlwaysBreakTemplateDeclarations: true
10+
AlwaysBreakBeforeMultilineStrings: true
11+
BreakBeforeBinaryOperators: false
12+
BreakConstructorInitializersBeforeComma: false
13+
BinPackParameters: true
14+
ColumnLimit: 80
15+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
16+
DerivePointerBinding: true
17+
ExperimentalAutoDetectBinPacking: false
18+
IndentCaseLabels: true
19+
MaxEmptyLinesToKeep: 1
20+
ObjCSpaceBeforeProtocolList: false
21+
PenaltyBreakComment: 60
22+
PenaltyBreakString: 1000
23+
PenaltyBreakFirstLessLess: 120
24+
PenaltyExcessCharacter: 1000000
25+
PenaltyReturnTypeOnItsOwnLine: 200
26+
PointerBindsToType: true
27+
SpacesBeforeTrailingComments: 2
28+
Cpp11BracedListStyle: true
29+
Standard: Auto
30+
IndentWidth: 2
31+
TabWidth: 4
32+
UseTab: false
33+
BreakBeforeBraces: Attach
34+
IndentFunctionDeclarationAfterType: true
35+
SpacesInParentheses: false
36+
SpaceInEmptyParentheses: false
37+
SpacesInCStyleCastParentheses: false
38+
SpaceAfterControlStatementKeyword: true

‎.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ env:
1010
- BOOST_VER=1.54.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release"
1111
- BOOST_VER=1.54.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug"
1212
- BOOST_VER=1.54.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug"
13+
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Release"
14+
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Release"
15+
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="ON" CMAKE_BUILD_TYPE="Debug"
16+
- BOOST_VER=1.55.0 BUILD_SHARED_LIBS="OFF" CMAKE_BUILD_TYPE="Debug"
1317

1418
before_install:
1519
- if [ "${CXX}" == "g++" ] || [ ${BUILD_SHARED_LIBS} = "OFF" ]; then

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include(GNUInstallDirs)
1616
if(WIN32 AND NOT CYGWIN)
1717
set(DEF_INSTALL_CMAKE_DIR CMake)
1818
else()
19-
set(DEF_INSTALL_CMAKE_DIR lib/CMake/cppnetlib)
19+
set(DEF_INSTALL_CMAKE_DIR lib/cmake/cppnetlib)
2020
endif()
2121
set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
2222

0 commit comments

Comments
 (0)