Skip to content

Commit 3ed24d2

Browse files
d-ledd-led
committed
added fmt as a regular vendored dependency and fixed its usage
1 parent 0e9103b commit 3ed24d2

File tree

224 files changed

+95318
-184
lines changed

Some content is hidden

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

224 files changed

+95318
-184
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,5 @@ tmp/
307307
conanpremake.lua
308308
conanbuildinfo.txt
309309
conaninfo.txt
310+
/influxdb-*/
311+
influxdb-*.gz

‎.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ cache:
2323
- apt
2424

2525
install:
26-
- wget https://dl.influxdata.com/influxdb/releases/influxdb-1.2.4_linux_amd64.tar.gz
27-
- tar xvfz influxdb-1.2.4_linux_amd64.tar.gz
26+
- wget https://dl.influxdata.com/influxdb/releases/influxdb-1.7.6_linux_amd64.tar.gz
27+
- tar xvfz influxdb-1.7.6_linux_amd64.tar.gz
2828

2929
script:
3030
- cd ${TRAVIS_BUILD_DIR}
31+
- premake/premake5-64 gmake
3132
- CXX=g++ make -C build/linux/gmake config=release_x64
3233
- /bin/bash -c "./src/script/test.sh bin/linux/gmake/x64/Release"

‎build/auth_test/auth_test.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<WarningLevel>Level3</WarningLevel>
9898
<Optimization>Disabled</Optimization>
9999
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
100+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
101101
</ClCompile>
102102
<Link>
103103
<SubSystem>Console</SubSystem>
@@ -111,7 +111,7 @@
111111
<WarningLevel>Level3</WarningLevel>
112112
<Optimization>Disabled</Optimization>
113113
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
114+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115115
</ClCompile>
116116
<Link>
117117
<SubSystem>Console</SubSystem>
@@ -127,7 +127,7 @@
127127
<FunctionLevelLinking>true</FunctionLevelLinking>
128128
<IntrinsicFunctions>true</IntrinsicFunctions>
129129
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131131
</ClCompile>
132132
<Link>
133133
<SubSystem>Console</SubSystem>
@@ -145,7 +145,7 @@
145145
<FunctionLevelLinking>true</FunctionLevelLinking>
146146
<IntrinsicFunctions>true</IntrinsicFunctions>
147147
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;$(SolutionDir)..\deps\catch\single_include;$(SolutionDir)..\src\influxdb-cpp-rest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
149149
</ClCompile>
150150
<Link>
151151
<SubSystem>Console</SubSystem>

‎build/deps.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PropertyGroup />
66
<ItemDefinitionGroup>
77
<ClCompile>
8-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
99
</ClCompile>
1010
</ItemDefinitionGroup>
1111
<ItemGroup />

‎build/influx-c-rest/influx-c-rest.vcxproj

+4
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<Optimization>Disabled</Optimization>
100100
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;BUILDING_INFLUX_C_REST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101101
<SDLCheck>false</SDLCheck>
102+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102103
</ClCompile>
103104
<Link>
104105
<SubSystem>Console</SubSystem>
@@ -113,6 +114,7 @@
113114
<Optimization>Disabled</Optimization>
114115
<PreprocessorDefinitions>_DEBUG;_CONSOLE;BUILDING_INFLUX_C_REST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
115116
<SDLCheck>false</SDLCheck>
117+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
116118
</ClCompile>
117119
<Link>
118120
<SubSystem>Console</SubSystem>
@@ -129,6 +131,7 @@
129131
<IntrinsicFunctions>true</IntrinsicFunctions>
130132
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;BUILDING_INFLUX_C_REST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131133
<SDLCheck>false</SDLCheck>
134+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132135
</ClCompile>
133136
<Link>
134137
<SubSystem>Console</SubSystem>
@@ -147,6 +150,7 @@
147150
<IntrinsicFunctions>true</IntrinsicFunctions>
148151
<PreprocessorDefinitions>NDEBUG;_CONSOLE;BUILDING_INFLUX_C_REST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149152
<SDLCheck>false</SDLCheck>
153+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
150154
</ClCompile>
151155
<Link>
152156
<SubSystem>Console</SubSystem>

‎build/influxdb-cpp-rest/influxdb-cpp-rest.vcxproj

+6-8
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<Optimization>Disabled</Optimization>
9090
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9191
<SDLCheck>true</SDLCheck>
92-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
92+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9393
</ClCompile>
9494
<Link>
9595
<SubSystem>Windows</SubSystem>
@@ -102,7 +102,7 @@
102102
<Optimization>Disabled</Optimization>
103103
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104104
<SDLCheck>true</SDLCheck>
105-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
106106
</ClCompile>
107107
<Link>
108108
<SubSystem>Windows</SubSystem>
@@ -117,7 +117,7 @@
117117
<IntrinsicFunctions>true</IntrinsicFunctions>
118118
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119119
<SDLCheck>true</SDLCheck>
120-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
120+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121121
</ClCompile>
122122
<Link>
123123
<SubSystem>Windows</SubSystem>
@@ -134,7 +134,7 @@
134134
<IntrinsicFunctions>true</IntrinsicFunctions>
135135
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<SDLCheck>true</SDLCheck>
137-
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
137+
<AdditionalIncludeDirectories>$(SolutionDir)..\deps\fmt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
138138
</ClCompile>
139139
<Link>
140140
<SubSystem>Windows</SubSystem>
@@ -151,10 +151,8 @@
151151
<ClInclude Include="..\..\src\influxdb-cpp-rest\input_sanitizer.h" />
152152
</ItemGroup>
153153
<ItemGroup>
154-
<ClCompile Include="..\..\deps\fmt\fmt\format.cc" />
155-
<ClCompile Include="..\..\deps\fmt\fmt\ostream.cc" />
156-
<ClCompile Include="..\..\deps\fmt\fmt\posix.cc" />
157-
<ClCompile Include="..\..\deps\fmt\fmt\printf.cc" />
154+
<ClCompile Include="..\..\deps\fmt\src\format.cc" />
155+
<ClCompile Include="..\..\deps\fmt\src\posix.cc" />
158156
<ClCompile Include="..\..\src\influxdb-cpp-rest\influxdb_raw_db.cpp" />
159157
<ClCompile Include="..\..\src\influxdb-cpp-rest\influxdb_raw_db_utf8.cpp" />
160158
<ClCompile Include="..\..\src\influxdb-cpp-rest\influxdb_simple_api.cpp" />

‎build/influxdb-cpp-rest/influxdb-cpp-rest.vcxproj.filters

+2-8
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,10 @@
5050
<ClCompile Include="..\..\src\influxdb-cpp-rest\influxdb_simple_async_api.cpp">
5151
<Filter>Source Files</Filter>
5252
</ClCompile>
53-
<ClCompile Include="..\..\deps\fmt\fmt\format.cc">
53+
<ClCompile Include="..\..\deps\fmt\src\format.cc">
5454
<Filter>Source Files</Filter>
5555
</ClCompile>
56-
<ClCompile Include="..\..\deps\fmt\fmt\ostream.cc">
57-
<Filter>Source Files</Filter>
58-
</ClCompile>
59-
<ClCompile Include="..\..\deps\fmt\fmt\posix.cc">
60-
<Filter>Source Files</Filter>
61-
</ClCompile>
62-
<ClCompile Include="..\..\deps\fmt\fmt\printf.cc">
56+
<ClCompile Include="..\..\deps\fmt\src\posix.cc">
6357
<Filter>Source Files</Filter>
6458
</ClCompile>
6559
</ItemGroup>

‎build/linux/gmake/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ help:
122122
@echo " test-influxdb-cpp-rest"
123123
@echo " test-influxdb-cpp-auth"
124124
@echo ""
125-
@echo "For more information, see http://industriousone.com/premake/quick-start"
125+
@echo "For more information, see https://github.com/premake/premake-core/wiki"

‎build/linux/gmake/demo.make

+18-17
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ifeq ($(config),debug_x32)
1616
TARGET = $(TARGETDIR)/demo
1717
OBJDIR = ../../../obj/linux/gmake/x32/Debug/demo
1818
DEFINES += -D_DEBUG
19-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
19+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
2020
FORCE_INCLUDE +=
2121
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2222
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -fPIC -g -std=c++14
@@ -32,7 +32,7 @@ ifeq ($(config),debug_x32)
3232
endef
3333
define POSTBUILDCMDS
3434
endef
35-
all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
35+
all: prebuild prelink $(TARGET)
3636
@:
3737

3838
endif
@@ -43,7 +43,7 @@ ifeq ($(config),debug_x64)
4343
TARGET = $(TARGETDIR)/demo
4444
OBJDIR = ../../../obj/linux/gmake/x64/Debug/demo
4545
DEFINES += -D_DEBUG
46-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
46+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
4747
FORCE_INCLUDE +=
4848
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
4949
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -fPIC -g -std=c++14
@@ -59,7 +59,7 @@ ifeq ($(config),debug_x64)
5959
endef
6060
define POSTBUILDCMDS
6161
endef
62-
all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
62+
all: prebuild prelink $(TARGET)
6363
@:
6464

6565
endif
@@ -70,7 +70,7 @@ ifeq ($(config),release_x32)
7070
TARGET = $(TARGETDIR)/demo
7171
OBJDIR = ../../../obj/linux/gmake/x32/Release/demo
7272
DEFINES +=
73-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
73+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
7474
FORCE_INCLUDE +=
7575
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
7676
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -fPIC -std=c++14
@@ -86,7 +86,7 @@ ifeq ($(config),release_x32)
8686
endef
8787
define POSTBUILDCMDS
8888
endef
89-
all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
89+
all: prebuild prelink $(TARGET)
9090
@:
9191

9292
endif
@@ -97,7 +97,7 @@ ifeq ($(config),release_x64)
9797
TARGET = $(TARGETDIR)/demo
9898
OBJDIR = ../../../obj/linux/gmake/x64/Release/demo
9999
DEFINES +=
100-
INCLUDES += -I../../../deps/fmt -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
100+
INCLUDES += -I../../../deps/fmt/include -I../../../deps/rxcpp/Rx/v2/src/rxcpp -I../../../src/influxdb-cpp-rest -I../../../src/influxdb-c-rest
101101
FORCE_INCLUDE +=
102102
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
103103
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -fPIC -std=c++14
@@ -113,7 +113,7 @@ ifeq ($(config),release_x64)
113113
endef
114114
define POSTBUILDCMDS
115115
endef
116-
all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
116+
all: prebuild prelink $(TARGET)
117117
@:
118118

119119
endif
@@ -125,19 +125,18 @@ RESOURCES := \
125125

126126
CUSTOMFILES := \
127127

128-
SHELLTYPE := msdos
129-
ifeq (,$(ComSpec)$(COMSPEC))
130-
SHELLTYPE := posix
131-
endif
132-
ifeq (/bin,$(findstring /bin,$(SHELL)))
133-
SHELLTYPE := posix
128+
SHELLTYPE := posix
129+
ifeq (.exe,$(findstring .exe,$(ComSpec)))
130+
SHELLTYPE := msdos
134131
endif
135132

136-
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES)
133+
$(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR)
137134
@echo Linking demo
138135
$(SILENT) $(LINKCMD)
139136
$(POSTBUILDCMDS)
140137

138+
$(CUSTOMFILES): | $(OBJDIR)
139+
141140
$(TARGETDIR):
142141
@echo Creating $(TARGETDIR)
143142
ifeq (posix,$(SHELLTYPE))
@@ -171,10 +170,12 @@ prelink:
171170
$(PRELINKCMDS)
172171

173172
ifneq (,$(PCH))
174-
$(OBJECTS): $(GCH) $(PCH)
175-
$(GCH): $(PCH)
173+
$(OBJECTS): $(GCH) $(PCH) | $(OBJDIR)
174+
$(GCH): $(PCH) | $(OBJDIR)
176175
@echo $(notdir $<)
177176
$(SILENT) $(CXX) -x c++-header $(ALL_CXXFLAGS) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
177+
else
178+
$(OBJECTS): | $(OBJDIR)
178179
endif
179180

180181
$(OBJDIR)/main.o: ../../../src/demo/main.cpp

0 commit comments

Comments
 (0)