Skip to content

Commit c1109b9

Browse files
committed
优化cmakelists配置文件
1 parent 8dbf200 commit c1109b9

File tree

2 files changed

+6
-180
lines changed

2 files changed

+6
-180
lines changed

.github/file/CMakeLists.txt.asc

Lines changed: 0 additions & 178 deletions
This file was deleted.

.github/script/build_enet_ios.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ echo 111---$rtt
1212
echo 222---$rc
1313
echo 333---$rb
1414

15-
gpg --quiet -d --passphrase "$PROVISIONING_PASSWORD" --batch .github/file/CMakeLists.txt.asc > .github/file/CMakeLists.txt
15+
#gpg --quiet -d --passphrase "$PROVISIONING_PASSWORD" --batch .github/file/CMakeLists.txt.asc > .github/file/CMakeLists.txt
1616

1717
#CURVERSION=$(git describe --tags `git rev-list --tags --max-count=1`) #获取tag
1818
#echo $CURVERSION
@@ -42,7 +42,11 @@ mkdir -p build/ios
4242

4343
cd build/ios
4444

45-
cp ../../../.github/file/CMakeLists.txt ../../CMakeLists.txt
45+
#cp ../../../.github/file/CMakeLists.txt ../../CMakeLists.txt
46+
perl -i -pe "s#.*armv7;armv7s;arm64.*#\t\tset(CMAKE_OSX_ARCHITECTURES \"arm64\" CACHE STRING \"\" FORCE)#g" ../../CMakeLists.txt
47+
perl -i -pe "s#.*src/service.*#\t\"src/service/*\"\n\t\"src/app_interface/*\"#g" ../../CMakeLists.txt
48+
perl -i -pe "s#.*bundle_static_library.*# #g" ../../CMakeLists.txt
49+
4650
cp ../../../.github/file/libcurl.a ../../app_interface/libcurl.a
4751

4852
mv ../../app_interface/curl_inc/* ../../app_interface

0 commit comments

Comments
 (0)