Merge pull request #33 from salesforce/add-support-2021.2

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

README.md

@@ -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.
 

p4-fusion/CMakeLists.txt

@@ -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)