Skip to content

Commit

Permalink
specify c++ sources in core and program-specific pri files (#48029)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkarneges authored Jun 27, 2024
1 parent 0b8890f commit 39460ec
Show file tree
Hide file tree
Showing 12 changed files with 277 additions and 278 deletions.
82 changes: 82 additions & 0 deletions src/core/core.pri
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
include(qzmq/src/src.pri)

HEADERS += $$PWD/processquit.h
SOURCES += $$PWD/processquit.cpp

HEADERS += \
$$PWD/tnetstring.h \
$$PWD/httpheaders.h \
$$PWD/zhttprequestpacket.h \
$$PWD/zhttpresponsepacket.h \
$$PWD/log.h \
$$PWD/bufferlist.h \
$$PWD/layertracker.h

SOURCES += \
$$PWD/tnetstring.cpp \
$$PWD/httpheaders.cpp \
$$PWD/zhttprequestpacket.cpp \
$$PWD/zhttpresponsepacket.cpp \
$$PWD/log.cpp \
$$PWD/bufferlist.cpp \
$$PWD/layertracker.cpp

HEADERS += \
$$PWD/packet/httprequestdata.h \
$$PWD/packet/httpresponsedata.h \
$$PWD/packet/retryrequestpacket.h \
$$PWD/packet/wscontrolpacket.h \
$$PWD/packet/statspacket.h \
$$PWD/packet/zrpcrequestpacket.h \
$$PWD/packet/zrpcresponsepacket.h

SOURCES += \
$$PWD/packet/retryrequestpacket.cpp \
$$PWD/packet/wscontrolpacket.cpp \
$$PWD/packet/statspacket.cpp \
$$PWD/packet/zrpcrequestpacket.cpp \
$$PWD/packet/zrpcresponsepacket.cpp

HEADERS += \
$$PWD/callback.h \
$$PWD/config.h \
$$PWD/timerwheel.h \
$$PWD/jwt.h \
$$PWD/rtimer.h \
$$PWD/logutil.h \
$$PWD/uuidutil.h \
$$PWD/zutil.h \
$$PWD/httprequest.h \
$$PWD/websocket.h \
$$PWD/zhttpmanager.h \
$$PWD/zhttprequest.h \
$$PWD/zwebsocket.h \
$$PWD/zrpcmanager.h \
$$PWD/zrpcrequest.h \
$$PWD/statusreasons.h \
$$PWD/inspectdata.h \
$$PWD/cors.h \
$$PWD/simplehttpserver.h \
$$PWD/stats.h \
$$PWD/statsmanager.h \
$$PWD/settings.h

SOURCES += \
$$PWD/config.cpp \
$$PWD/timerwheel.cpp \
$$PWD/jwt.cpp \
$$PWD/rtimer.cpp \
$$PWD/logutil.cpp \
$$PWD/uuidutil.cpp \
$$PWD/zutil.cpp \
$$PWD/zhttpmanager.cpp \
$$PWD/zhttprequest.cpp \
$$PWD/zwebsocket.cpp \
$$PWD/zrpcmanager.cpp \
$$PWD/zrpcrequest.cpp \
$$PWD/statusreasons.cpp \
$$PWD/cors.cpp \
$$PWD/simplehttpserver.cpp \
$$PWD/stats.cpp \
$$PWD/statsmanager.cpp \
$$PWD/settings.cpp
6 changes: 6 additions & 0 deletions src/core/tests.pri
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
INCLUDES += \
$$PWD/coretests.h

SOURCES += \
$$PWD/httpheaderstest.cpp \
$$PWD/jwttest.cpp
250 changes: 0 additions & 250 deletions src/cpp.pri

This file was deleted.

19 changes: 18 additions & 1 deletion src/cpp.pro
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,21 @@ MOC_DIR = $$cpp_build_dir/moc
OBJECTS_DIR = $$cpp_build_dir/obj

include($$cpp_build_dir/conf.pri)
include(cpp.pri)

QMAKE_CXXFLAGS += $$(CXXFLAGS)
QMAKE_CFLAGS += $$(CFLAGS)
QMAKE_LFLAGS += $$(LDFLAGS)

SRC_DIR = $$PWD

DEFINES += NO_IRISNET

INCLUDEPATH += $$SRC_DIR/../target/include
INCLUDEPATH += $$SRC_DIR/core
INCLUDEPATH += $$SRC_DIR/core/qzmq/src

include(core/core.pri)
include(m2adapter/m2adapter.pri)
include(proxy/proxy.pri)
include(handler/handler.pri)
include(runner/runner.pri)
Loading

0 comments on commit 39460ec

Please sign in to comment.