Tell libetpan where to find libssl on Sierra+

brianmario/mysql2#795
Foundry376 · Oct 29, 2019 · 7590b28 · 7590b28
1 parent 453bf90
commit 7590b28
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Vendor/libetpan/build-mac/autogen-result.tar.gz b/Vendor/libetpan/build-mac/autogen-result.tar.gz
diff --git a/Vendor/libetpan/build-mac/libetpan.xcodeproj/project.pbxproj b/Vendor/libetpan/build-mac/libetpan.xcodeproj/project.pbxproj
@@ -2522,6 +2522,7 @@
 					"$(SRCROOT)/..",
 					"$(SRCROOT)/include",
 				);
+				LIBRARY_SEARCH_PATHS = /usr/local/opt/openssl/lib/;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DHAVE_CFNETWORK=1",
@@ -2542,6 +2543,7 @@
 					"$(SRCROOT)/..",
 					"$(SRCROOT)/include",
 				);
+				LIBRARY_SEARCH_PATHS = /usr/local/opt/openssl/lib/;
 				OTHER_CFLAGS = (
 					"-DHAVE_CFNETWORK=1",
 					"-DHAVE_CONFIG_H=1",

diff --git a/Vendor/libetpan/build-mac/libetpan.xcodeproj/xcshareddata/xcschemes/libetpan.xcscheme b/Vendor/libetpan/build-mac/libetpan.xcodeproj/xcshareddata/xcschemes/libetpan.xcscheme
@@ -23,21 +23,22 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -48,14 +49,12 @@
             ReferencedContainer = "container:libetpan.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction