Skip to content

Commit c94a2ee

Browse files
mccaffersmccaffers
committed
Updating workflows
1 parent 6543044 commit c94a2ee

2 files changed

Lines changed: 14 additions & 18 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ jobs:
4747
-derivedDataPath "${RUNNER_TEMP}/Build/DerivedData"
4848
-parallelizeTargets
4949
-jobs "$(sysctl -n hw.logicalcpu)"
50-
LIBRARY_SEARCH_PATHS="./external/libpqxx/src/ ./external/libpqxx/build/src/"
51-
OTHER_LDFLAGS="-L./external/libpqxx/build/src -lpqxx -lpq -L$(brew --prefix pkgconf)/lib -L$(brew --prefix pkgconf)/lib/pkgconfig -L$(brew --prefix postgresql@18)/lib/postgresql -L$(brew --prefix postgresql@18)/lib/postgresql/pgxs -L$(brew --prefix postgresql@18)/lib/postgresql/pkgconfig"
5250
clean build test
5351
| xcpretty -r junit && exit ${PIPESTATUS[0]}
5452

‎backtesting-engine-cpp.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
943398252D57E53400287A2D /* jsonParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 943398232D57E53400287A2D /* jsonParser.cpp */; };
2222
943398272D57E54000287A2D /* jsonParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = 943398262D57E54000287A2D /* jsonParser.mm */; };
2323
94364CB62D416D8D00F35B55 /* db.mm in Sources */ = {isa = PBXBuildFile; fileRef = 94364CB52D416D8000F35B55 /* db.mm */; };
24-
944698852D3A545B0070E30F /* libpq.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CD8A972D2D34A100041BBA /* libpq.a */; };
2524
9464E5F12FA7467200D82BAD /* symbolScale.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9464E5F02FA7467200D82BAD /* symbolScale.mm */; };
2625
94674B872D533B4000973137 /* tradeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94674B852D533B4000973137 /* tradeManager.cpp */; };
2726
94674B882D533B4000973137 /* tradeManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94674B852D533B4000973137 /* tradeManager.cpp */; };
@@ -32,11 +31,8 @@
3231
9470B5B62C8C5BFD007D9CC6 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9470B5A32C8C5AD0007D9CC6 /* main.cpp */; };
3332
94724A832F8B92C10029B940 /* operations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94724A822F8B92C10029B940 /* operations.cpp */; };
3433
94724A842F8B92C10029B940 /* operations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94724A822F8B92C10029B940 /* operations.cpp */; };
35-
94CD8B992D2DCDD800041BBA /* libpqxx-7.10.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CD8B982D2DCDD800041BBA /* libpqxx-7.10.a */; };
36-
94CD8B9C2D2DD02A00041BBA /* libpqxx-7.10.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CD8B9A2D2DCF6E00041BBA /* libpqxx-7.10.a */; };
3734
94CD8BA02D2E8CE500041BBA /* databaseConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94CD8B9F2D2E8CE500041BBA /* databaseConnection.cpp */; };
3835
94CD8BA12D2E8CE500041BBA /* databaseConnection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94CD8B9F2D2E8CE500041BBA /* databaseConnection.cpp */; };
39-
94CD8BA22D2E8FC600041BBA /* libpq.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 94CD8A972D2D34A100041BBA /* libpq.a */; };
4036
/* End PBXBuildFile section */
4137

4238
/* Begin PBXCopyFilesBuildPhase section */
@@ -1265,17 +1261,13 @@
12651261
isa = PBXFrameworksBuildPhase;
12661262
buildActionMask = 2147483647;
12671263
files = (
1268-
94CD8BA22D2E8FC600041BBA /* libpq.a in Frameworks */,
1269-
94CD8B992D2DCDD800041BBA /* libpqxx-7.10.a in Frameworks */,
12701264
);
12711265
runOnlyForDeploymentPostprocessing = 0;
12721266
};
12731267
9470B5A92C8C5B99007D9CC6 /* Frameworks */ = {
12741268
isa = PBXFrameworksBuildPhase;
12751269
buildActionMask = 2147483647;
12761270
files = (
1277-
944698852D3A545B0070E30F /* libpq.a in Frameworks */,
1278-
94CD8B9C2D2DD02A00041BBA /* libpqxx-7.10.a in Frameworks */,
12791271
);
12801272
runOnlyForDeploymentPostprocessing = 0;
12811273
};
@@ -3782,11 +3774,14 @@
37823774
INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = "";
37833775
LIBRARY_SEARCH_PATHS = (
37843776
"\"$(SRCROOT)/external/libpqxx/build/src\"",
3785-
"/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql",
3777+
"/opt/homebrew/opt/postgresql@18/lib/postgresql",
37863778
"\"$(SRCROOT)/external/boost-decimal/build\"",
37873779
);
37883780
MACOSX_DEPLOYMENT_TARGET = 26.0;
3789-
OTHER_LDFLAGS = "";
3781+
OTHER_LDFLAGS = (
3782+
"-lpq",
3783+
"-lpqxx",
3784+
);
37903785
OTHER_LIBTOOLFLAGS = "";
37913786
PRODUCT_NAME = "$(TARGET_NAME)";
37923787
SECTORDER_FLAGS = "";
@@ -3808,11 +3803,14 @@
38083803
INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = "";
38093804
LIBRARY_SEARCH_PATHS = (
38103805
"\"$(SRCROOT)/external/libpqxx/build/src\"",
3811-
"/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql",
3806+
"/opt/homebrew/opt/postgresql@18/lib/postgresql",
38123807
"\"$(SRCROOT)/external/boost-decimal/build\"",
38133808
);
38143809
MACOSX_DEPLOYMENT_TARGET = 26.0;
3815-
OTHER_LDFLAGS = "";
3810+
OTHER_LDFLAGS = (
3811+
"-lpq",
3812+
"-lpqxx",
3813+
);
38163814
OTHER_LIBTOOLFLAGS = "";
38173815
PRODUCT_NAME = "$(TARGET_NAME)";
38183816
SECTORDER_FLAGS = "";
@@ -3827,14 +3825,14 @@
38273825
GENERATE_INFOPLIST_FILE = YES;
38283826
HEADER_SEARCH_PATHS = (
38293827
"\"$(SRCROOT)/include\"",
3828+
"\"$(SRCROOT)/external/\"",
38303829
"\"$(SRCROOT)/external/libpqxx/include\"",
38313830
"\"$(SRCROOT)/external/libpqxx/include/pqxx/internal\"",
3832-
"\"$(SRCROOT)/external/\"",
38333831
"\"$(SRCROOT)/external/boost-decimal/include\"",
38343832
);
38353833
LIBRARY_SEARCH_PATHS = (
38363834
"\"$(SRCROOT)/external/libpqxx/build/src\"",
3837-
"/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql",
3835+
"/opt/homebrew/opt/postgresql@18/lib/postgresql",
38383836
"\"$(SRCROOT)/external/boost-decimal/build\"",
38393837
);
38403838
MACOSX_DEPLOYMENT_TARGET = 26.0;
@@ -3853,14 +3851,14 @@
38533851
GENERATE_INFOPLIST_FILE = YES;
38543852
HEADER_SEARCH_PATHS = (
38553853
"\"$(SRCROOT)/include\"",
3854+
"\"$(SRCROOT)/external/\"",
38563855
"\"$(SRCROOT)/external/libpqxx/include\"",
38573856
"\"$(SRCROOT)/external/libpqxx/include/pqxx/internal\"",
3858-
"\"$(SRCROOT)/external/\"",
38593857
"\"$(SRCROOT)/external/boost-decimal/include\"",
38603858
);
38613859
LIBRARY_SEARCH_PATHS = (
38623860
"\"$(SRCROOT)/external/libpqxx/build/src\"",
3863-
"/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql",
3861+
"/opt/homebrew/opt/postgresql@18/lib/postgresql",
38643862
"\"$(SRCROOT)/external/boost-decimal/build\"",
38653863
);
38663864
MACOSX_DEPLOYMENT_TARGET = 26.0;

0 commit comments

Comments
 (0)