Skip to content

Commit 0c29e41

Browse files
committed
Updating iOS build scripts to change binary name from casablanca to cpprest.
1 parent d42523e commit 0c29e41

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Build_iOS/CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ execute_process(WORKING_DIRECTORY ${ARM_BINARY_DIR}
3535
add_custom_target(sim
3636
COMMAND ${CMAKE_COMMAND}
3737
--build ${SIM_BINARY_DIR}
38-
--target casablanca
38+
--target cpprest
3939
--config ${CMAKE_BUILD_TYPE}
4040
COMMENT "Building for i386 (simulator)"
4141
VERBATIM
@@ -45,24 +45,25 @@ add_custom_target(sim
4545
add_custom_target(arm
4646
COMMAND ${CMAKE_COMMAND}
4747
--build ${ARM_BINARY_DIR}
48-
--target casablanca
48+
--target cpprest
4949
--config ${CMAKE_BUILD_TYPE}
5050
COMMENT "Building for armv7, armv7s, arm64"
5151
VERBATIM
5252
)
5353

54+
set(LIB_CPPREST libcasablanca.a)
5455
add_custom_command(
55-
OUTPUT libcasablanca.a
56+
OUTPUT ${LIB_CPPREST}
5657
COMMAND lipo -create
57-
-output "${CMAKE_CURRENT_BINARY_DIR}/libcasablanca.a"
58-
${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a
59-
${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a
58+
-output "${CMAKE_CURRENT_BINARY_DIR}/${LIB_CPPREST}"
59+
${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}
60+
${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}
6061
DEPENDS
6162
sim
6263
arm
63-
"${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a"
64-
"${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a"
64+
"${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}"
65+
"${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}"
6566
VERBATIM
6667
)
6768

68-
add_custom_target(casablanca ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libcasablanca.a)
69+
add_custom_target(cpprest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${LIB_CPPREST})

Build_iOS/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Using Casablanca
110110
----------------
111111
You will need to link against the following from your project:
112112

113-
* build.ios/libcasablanca.a
113+
* build.ios/libcpprest.a
114114
* boost.framework
115115
* openssl/lib/libcrypto.a
116116
* openssl/lib/libssl.a

0 commit comments

Comments
 (0)