-
Notifications
You must be signed in to change notification settings - Fork 4
Dev/gitignore #9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -11,15 +11,13 @@ cd ./external/libpqxx | |||||||||||||||
| mkdir -p build | ||||||||||||||||
| cd ./build | ||||||||||||||||
|
|
||||||||||||||||
| # Generate build system files using CMake | ||||||||||||||||
| # '..' points to the libpqxx root directory containing CMakeLists.txt | ||||||||||||||||
| cmake .. | ||||||||||||||||
| # Expose paths so CMake finds libpq | ||||||||||||||||
| export PATH="$(brew --prefix libpq)/bin:$PATH" | ||||||||||||||||
| export PKG_CONFIG_PATH="$(brew --prefix libpq)/lib/pkgconfig:$PKG_CONFIG_PATH" | ||||||||||||||||
| export PostgreSQL_ROOT="$(brew --prefix libpq)" | ||||||||||||||||
|
Comment on lines
+15
to
+17
|
||||||||||||||||
| export PATH="$(brew --prefix libpq)/bin:$PATH" | |
| export PKG_CONFIG_PATH="$(brew --prefix libpq)/lib/pkgconfig:$PKG_CONFIG_PATH" | |
| export PostgreSQL_ROOT="$(brew --prefix libpq)" | |
| POSTGRESQL_PREFIX="$(brew --prefix postgresql)" | |
| export PATH="$POSTGRESQL_PREFIX/bin:$PATH" | |
| export PKG_CONFIG_PATH="$POSTGRESQL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" | |
| export PostgreSQL_ROOT="$POSTGRESQL_PREFIX" |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -62,7 +62,7 @@ jobs: | |||||
| -derivedDataPath "${RUNNER_TEMP}/Build/DerivedData" | ||||||
| HEADER_SEARCH_PATHS="./external/libpqxx/include/pqxx/internal ./external/libpqxx/include/ ./external/libpqxx/build/include/ ./external/" | ||||||
| LIBRARY_SEARCH_PATHS="./external/libpqxx/src/ ./external/libpqxx/build/src/" | ||||||
| OTHER_LDFLAGS="-L./external/libpqxx/build/src -lpqxx -lpq -L/opt/homebrew/Cellar/pkgconf/2.3.0_1/lib -L/opt/homebrew/Cellar/pkgconf/2.3.0_1/lib/pkgconfig -L/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14 -L/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14/pgxs -L/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14/pkgconfig" | ||||||
| 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" | ||||||
|
||||||
| 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" | |
| OTHER_LDFLAGS="-L./external/libpqxx/build/src -lpqxx -lpq -L$(brew --prefix pkg-config)/lib -L$(brew --prefix pkg-config)/lib/pkgconfig -L$(brew --prefix postgresql)/lib/postgresql -L$(brew --prefix postgresql)/lib/postgresql/pgxs -L$(brew --prefix postgresql)/lib/postgresql/pkgconfig" |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3785,9 +3785,8 @@ | |||||
| ); | ||||||
| INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = ""; | ||||||
| LIBRARY_SEARCH_PATHS = ( | ||||||
| "\"$(SRCROOT)/external/libpqxx/src\"", | ||||||
| "$(SRCROOT)/build/external/libpqxx/src", | ||||||
| "/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14", | ||||||
| "\"$(SRCROOT)/external/libpqxx/build/src\"", | ||||||
| "/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql", | ||||||
| ); | ||||||
|
Comment on lines
3787
to
3790
|
||||||
| OTHER_LDFLAGS = ""; | ||||||
| OTHER_LIBTOOLFLAGS = ""; | ||||||
|
|
@@ -3808,9 +3807,8 @@ | |||||
| ); | ||||||
| INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = ""; | ||||||
| LIBRARY_SEARCH_PATHS = ( | ||||||
| "\"$(SRCROOT)/external/libpqxx/src\"", | ||||||
| "$(SRCROOT)/build/external/libpqxx/src", | ||||||
| "/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14", | ||||||
| "\"$(SRCROOT)/external/libpqxx/build/src\"", | ||||||
| "/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql", | ||||||
| ); | ||||||
|
Comment on lines
3809
to
3812
|
||||||
| OTHER_LDFLAGS = ""; | ||||||
| OTHER_LIBTOOLFLAGS = ""; | ||||||
|
|
@@ -3831,9 +3829,8 @@ | |||||
| "\"$(SRCROOT)/external/", | ||||||
| ); | ||||||
| LIBRARY_SEARCH_PATHS = ( | ||||||
| "\"$(SRCROOT)/external/libpqxx/src\"", | ||||||
| "$(PROJECT_DIR)/build/external/libpqxx/src", | ||||||
| "/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14", | ||||||
| "\"$(SRCROOT)/external/libpqxx/build/src\"", | ||||||
| "/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql", | ||||||
| ); | ||||||
|
Comment on lines
3831
to
3834
|
||||||
| MARKETING_VERSION = 1.0; | ||||||
| PRODUCT_BUNDLE_IDENTIFIER = com.mccaffers.tests; | ||||||
|
|
@@ -3854,9 +3851,8 @@ | |||||
| "\"$(SRCROOT)/external/", | ||||||
| ); | ||||||
| LIBRARY_SEARCH_PATHS = ( | ||||||
| "\"$(SRCROOT)/external/libpqxx/src\"", | ||||||
| "$(PROJECT_DIR)/build/external/libpqxx/src", | ||||||
| "/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14", | ||||||
| "\"$(SRCROOT)/external/libpqxx/build/src\"", | ||||||
| "/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql", | ||||||
|
||||||
| "/opt/homebrew/Cellar/postgresql@18/18.3/lib/postgresql", | |
| "/opt/homebrew/opt/postgresql@18/lib/postgresql", |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,10 @@ | |||||||||||||||||
| xcodebuild \ | ||||||||||||||||||
| -project backtesting-engine-cpp.xcodeproj \ | ||||||||||||||||||
| -scheme tests \ | ||||||||||||||||||
| HEADER_SEARCH_PATHS="./external/libpqxx/include/pqxx/internal ./external/libpqxx/include/ ./external/libpqxx/build/include/ ./external/" \ | ||||||||||||||||||
| LIBRARY_SEARCH_PATHS="./external/libpqxx/src/ ./external/libpqxx/build/src/" \ | ||||||||||||||||||
| OTHER_LDFLAGS="-L./external/libpqxx/build/src -lpqxx -lpq -L/opt/homebrew/Cellar/pkgconf/2.3.0_1/lib -L/opt/homebrew/Cellar/pkgconf/2.3.0_1/lib/pkgconfig -L/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14 -L/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14/pgxs -L/opt/homebrew/Cellar/postgresql@14/14.15/lib/postgresql@14/pkgconfig" \ | ||||||||||||||||||
| clean build test | ||||||||||||||||||
| clean build test | ||||||||||||||||||
| # HEADER_SEARCH_PATHS="./external/libpqxx/include/pqxx/internal ./external/libpqxx/include/ ./external/libpqxx/build/include/ ./external/" \ | ||||||||||||||||||
| # LIBRARY_SEARCH_PATHS="./external/libpqxx/src/ ./external/libpqxx/build/src/" \ | ||||||||||||||||||
| # 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" \ | ||||||||||||||||||
|
Comment on lines
+6
to
+9
|
||||||||||||||||||
| clean build test | |
| # HEADER_SEARCH_PATHS="./external/libpqxx/include/pqxx/internal ./external/libpqxx/include/ ./external/libpqxx/build/include/ ./external/" \ | |
| # LIBRARY_SEARCH_PATHS="./external/libpqxx/src/ ./external/libpqxx/build/src/" \ | |
| # 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" \ | |
| # HEADER_SEARCH_PATHS="./external/libpqxx/include/pqxx/internal ./external/libpqxx/include/ ./external/libpqxx/build/include/ ./external/" \ | |
| # LIBRARY_SEARCH_PATHS="./external/libpqxx/src/ ./external/libpqxx/build/src/" \ | |
| # 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" \ | |
| clean build test |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The workflow scripts reference the separate Homebrew
libpqformula (e.g.,brew --prefix libpqinbuild.sh). Installingpostgresqldoesn’t guaranteebrew --prefix libpqwill work, so CI can still fail unlesslibpqis installed explicitly (or the other scripts are updated to usepostgresql’s prefix).