Skip to content

Improved support for using FMDB as a framework #136

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.

Sign up for GitHub

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

Open
asendra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improved support for using FMDB as a framework #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion FCModel/FCModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#include <AvailabilityMacros.h>

#ifdef COCOAPODS
#ifdef FMDB_FRAMEWORK
#import <FMDB/FMDatabase.h>
#else
#import "FMDatabase.h"
Expand Down
11 changes: 9 additions & 2 deletions FCModel/FCModel.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@
#import "FCModel.h"
#import "FCModelCachedObject.h"
#import "FCModelDatabaseQueue.h"
#import "FMDatabase.h"
#import "FMDatabaseAdditions.h"

#ifdef FMDB_FRAMEWORK
#import <FMDB/FMDatabase.h>
#import <FMDB/FMDatabaseAdditions.h>
#else
#import "FMDatabase.h"
#import "FMDatabaseAdditions.h"
#endif

#import <sqlite3.h>
#import <Security/Security.h>

Expand Down
2 changes: 1 addition & 1 deletion FCModel/FCModelDatabaseQueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#import <Foundation/Foundation.h>

#ifdef COCOAPODS
#ifdef FMDB_FRAMEWORK
#import <FMDB/FMDatabase.h>
#else
#import "FMDatabase.h"
Expand Down