Skip to content

Commit f5a701d

Browse files
authored
Feature/project update and refactor (#135)
* Update googletest submodule to release 1.8.1 * Add status section for compiler configuration * Add gitignore section * Fix compiler flags for modern compilers * Fix path doc description * Fix recursion on some compilers due to wrong copy_part method used * Fix clang-format, remove useless states, update style according to used ones * Apply codestyle to all files * Apply codestyle to leftovers sources
1 parent d21e7c7 commit f5a701d

27 files changed

+447
-538
lines changed

.clang-format

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
BasedOnStyle: Google
22
AccessModifierOffset: -1
33
ConstructorInitializerIndentWidth: 4
4-
AlignEscapedNewlinesLeft: true
54
AlignTrailingComments: true
65
AllowAllParametersOfDeclarationOnNextLine: true
76
AllowShortIfStatementsOnASingleLine: true
@@ -13,7 +12,7 @@ BreakConstructorInitializersBeforeComma: false
1312
BinPackParameters: true
1413
ColumnLimit: 80
1514
ConstructorInitializerAllOnOneLineOrOnePerLine: true
16-
DerivePointerBinding: true
15+
DerivePointerAlignment: false
1716
ExperimentalAutoDetectBinPacking: false
1817
IndentCaseLabels: true
1918
MaxEmptyLinesToKeep: 1
@@ -23,16 +22,15 @@ PenaltyBreakString: 1000
2322
PenaltyBreakFirstLessLess: 120
2423
PenaltyExcessCharacter: 1000000
2524
PenaltyReturnTypeOnItsOwnLine: 200
26-
PointerBindsToType: true
25+
PointerAlignment: Right
2726
SpacesBeforeTrailingComments: 2
2827
Cpp11BracedListStyle: true
2928
Standard: Auto
3029
IndentWidth: 2
3130
TabWidth: 4
3231
UseTab: false
3332
BreakBeforeBraces: Attach
34-
IndentFunctionDeclarationAfterType: true
33+
SortIncludes: false
3534
SpacesInParentheses: false
3635
SpaceInEmptyParentheses: false
3736
SpacesInCStyleCastParentheses: false
38-
SpaceAfterControlStatementKeyword: true

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Build artifacts
12
_build
23
cmake-build-*
34
.idea

CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ find_package(Threads REQUIRED)
1818

1919
set(CMAKE_VERBOSE_MAKEFILE true)
2020

21+
message(STATUS "Configure compiler")
22+
message("Using ${CMAKE_CXX_COMPILER_ID}")
2123
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
2224
INCLUDE(CheckCXXCompilerFlag)
2325
CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STD11)
@@ -33,7 +35,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
3335
endif()
3436

3537
if (Uri_WARNINGS_AS_ERRORS)
36-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
38+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-parentheses")
3739
endif()
3840

3941
message("C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")
@@ -49,7 +51,7 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
4951
endif()
5052

5153
if (Uri_WARNINGS_AS_ERRORS)
52-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
54+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-parentheses")
5355
endif()
5456

5557
message("C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")

deps/googletest

Submodule googletest updated 336 files

0 commit comments

Comments
 (0)