Skip to content

Conditionally include iOS-Wrapper project #415

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

Merged
axxel merged 4 commits into from
Oct 10, 2022
Merged

Conditionally include iOS-Wrapper project #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b8384b
Add compile time check for whether to include the iOS Wrappers project.
Alex-MSFT Sep 20, 2022
a011852
Missing slash
Alex-MSFT Sep 21, 2022
a9d8f7b
Disable bitcode for iOS wrapper project by default
Alex-MSFT Sep 21, 2022
019cc46
Rename compile definition to BUILD_APPLE_FRAMEWORK
Alex-MSFT Sep 22, 2022
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
4 changes: 2 additions & 2 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ endif()

set_target_properties(ZXing PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")

if (APPLE)
if (APPLE AND BUILD_APPLE_FRAMEWORK)
set_target_properties(ZXing PROPERTIES
FRAMEWORK TRUE
FRAMEWORK_VERSION "C"
Expand All @@ -475,7 +475,7 @@ if (APPLE)
#MACOSX_FRAMEWORK_INFO_PLIST Info.plist
PUBLIC_HEADER "${PUBLIC_HEADERS}"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer"
XCODE_ATTRIBUTE_ENABLE_BITCODE "YES"
XCODE_ATTRIBUTE_ENABLE_BITCODE "NO"
)
endif()

Expand Down
3 changes: 2 additions & 1 deletion wrappers/ios/build-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ cmake -S../../ -B_builds -GXcode \
-DCMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH=NO \
-DBUILD_UNIT_TESTS=NO \
-DBUILD_BLACKBOX_TESTS=NO \
-DBUILD_EXAMPLES=NO
-DBUILD_EXAMPLES=NO \
-DBUILD_APPLE_FRAMEWORK=YES

echo ========= Build the sdk for simulators
xcodebuild -project _builds/ZXing.xcodeproj build \
Expand Down