From caa9af0e44c860ce7ab1a46a67108a60f6a487a4 Mon Sep 17 00:00:00 2001 From: Alexander Mackworth Date: Tue, 5 Aug 2014 18:01:19 -0700 Subject: [PATCH 1/4] Enable module. --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index f0cb92a50..e70ce6aa6 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1566,6 +1566,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0A463D817E57C45000F5021 /* Debug.xcconfig */; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ENABLE_MODULES = YES; + DEFINES_MODULE = YES; GCC_STRICT_ALIASING = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; HEADER_SEARCH_PATHS = ( @@ -1591,6 +1594,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0A463DA17E57C45000F5021 /* Release.xcconfig */; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ENABLE_MODULES = YES; + DEFINES_MODULE = YES; GCC_STRICT_ALIASING = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; HEADER_SEARCH_PATHS = ( @@ -1703,6 +1709,9 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0A463D917E57C45000F5021 /* Profile.xcconfig */; buildSettings = { + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; + CLANG_ENABLE_MODULES = YES; + DEFINES_MODULE = YES; GCC_STRICT_ALIASING = NO; GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = NO; HEADER_SEARCH_PATHS = ( From 49140eb3a063c6963221e5ba39ecde5f9208e976 Mon Sep 17 00:00:00 2001 From: Alexander Mackworth Date: Tue, 5 Aug 2014 18:02:17 -0700 Subject: [PATCH 2/4] Add Foundation import. --- Classes/ObjectiveGit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/ObjectiveGit.h b/Classes/ObjectiveGit.h index f2bca21a7..2b711a1d5 100644 --- a/Classes/ObjectiveGit.h +++ b/Classes/ObjectiveGit.h @@ -22,8 +22,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. // - #import "git2.h" +#import #import #import From 1219989bc1182929366fb39edd486a7aa1103c30 Mon Sep 17 00:00:00 2001 From: Alexander Mackworth Date: Tue, 5 Aug 2014 21:57:20 -0700 Subject: [PATCH 3/4] Add module map. --- ObjectiveGitFramework.xcodeproj/project.pbxproj | 3 +++ module.map | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 module.map diff --git a/ObjectiveGitFramework.xcodeproj/project.pbxproj b/ObjectiveGitFramework.xcodeproj/project.pbxproj index e70ce6aa6..652327aa8 100644 --- a/ObjectiveGitFramework.xcodeproj/project.pbxproj +++ b/ObjectiveGitFramework.xcodeproj/project.pbxproj @@ -1574,6 +1574,7 @@ HEADER_SEARCH_PATHS = ( External/libgit2/include, /usr/local/include, + "\"$(SRCROOT)/External/libgit2/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ( @@ -1602,6 +1603,7 @@ HEADER_SEARCH_PATHS = ( External/libgit2/include, /usr/local/include, + "\"$(SRCROOT)/External/libgit2/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ( @@ -1717,6 +1719,7 @@ HEADER_SEARCH_PATHS = ( External/libgit2/include, /usr/local/include, + "\"$(SRCROOT)/External/libgit2/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 6.0; LIBRARY_SEARCH_PATHS = ( diff --git a/module.map b/module.map new file mode 100644 index 000000000..da9dcbb0e --- /dev/null +++ b/module.map @@ -0,0 +1,5 @@ +module ObjectiveGit { + header "Classes/ObjectiveGit.h" + link framework "ObjectiveGit" + export * +} \ No newline at end of file From a66a0e7e6033073e6c205a5918f1fb5a81d08206 Mon Sep 17 00:00:00 2001 From: Alexander Mackworth Date: Wed, 6 Aug 2014 10:09:55 -0700 Subject: [PATCH 4/4] Renamed module map. --- module.map => module.modulemap | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename module.map => module.modulemap (100%) diff --git a/module.map b/module.modulemap similarity index 100% rename from module.map rename to module.modulemap