Skip to content
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

build: Add support for Helix Core C++ API version 2021.2 #33

Merged
merged 1 commit into from
May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ These execution times are expected to scale as expected with larger depots (mill
* Install CMake 3.16+.
* Install g++ 11.2.0 (older versions compatible with C++11 are also supported).
* Clone this repository or [get a release distribution](https://github.com/salesforce/p4-fusion/releases).
* Get Helix Core C++ API from the [official Perforce distribution](https://www.perforce.com/downloads/helix-core-c/c-api). Version 2021.1/2179737 shall have the best compatibility. Extract the contents in `./vendor/helix-core-api/linux/` or `./vendor/helix-core-api/mac/` based on your OS.
* Get Helix Core C++ API from the [official Perforce distribution](https://www.perforce.com/downloads/helix-core-c/c-api). Both the 2021.1 and 2021.2 versions of the Helix Core C++ API will work.
* Extract the contents in `./vendor/helix-core-api/linux/` or `./vendor/helix-core-api/mac/` based on your OS.

> For CentOS, you can try `yum install git make cmake gcc-c++ libarchive` to set up the compilation toolchain. Installing `libarchive` is only required to fix a bug that stops CMake from starting properly.

Expand Down
14 changes: 8 additions & 6 deletions p4-fusion/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ target_link_directories(p4-fusion PUBLIC
set(Frameworks "")

if (APPLE)
find_library(corefoundation_lib CoreFoundation REQUIRED)
find_library(cfnetwork_lib CFNetwork REQUIRED)
find_library(COCOA_LIBRARY Cocoa REQUIRED)
find_library(COREFOUNDATION_LIB CoreFoundation REQUIRED)
find_library(CFNETWORK_LIB CFNetwork REQUIRED)
find_library(COCOA_LIB Cocoa REQUIRED)
find_library(SECURITY_LIB Security REQUIRED)
set(Frameworks
${Frameworks}
${cfnetwork_lib}
${corefoundation_lib}
${COCOA_LIBRARY}
${CFNETWORK_LIB}
${COREFOUNDATION_LIB}
${COCOA_LIB}
${SECURITY_LIB}
)
endif(APPLE)

Expand Down