This repository has been archived by the owner on Jun 23, 2022. It is now read-only.
scripts: minor fixes on cmake #166
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
neverchanje
requested review from
qinzuoyan,
shengofsun,
acelyc111,
hycdong,
zhangyifan27,
vagetablechicken and
mentoswang
vagetablechicken
approved these changes
Sep 28, 2018
qinzuoyan
approved these changes
Sep 29, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
一方面是上次提交的 #165 编译 pegasus 有问题，这里修复一下，另一方面是继续对整个编译流程进行重构。
由于 pegasus 和 rdsn 分成两个项目，所以编译流程真的很复杂，希望以后在两项目融合之后可以继续简化这个过程。
以前 pegasus 的编译需要两个环境变量 DSN_ROOT 和 DSN_THIRDPARTY_ROOT，这两个变量在 build.sh 里设置，对于 qt-ide 来讲没有问题，但如果是使用 clion 的用户就需要配置这两项，很麻烦，而且真正看过 cmake 代码的同学很容易混淆。为啥呢？
因为如果在 pegasus 目录下
./run.sh build，那 DSN_ROOT = pegasus/DSN_ROOT如果在 rdsn 目录下编译，DSN_ROOT = /home/mi/git/pegasus/rdsn/builder/output
明明很简单的事情就搞得很复杂，现在我们简化了这个流程，让编译过程更清晰
编译后我测试了 pack_server 和 pack_tools 都没有问题。pegasus 对应的 pr 会在后面提。
这次 PR 还修复了一个依赖问题：
在 download-thirdparty.sh 里 s2 以前是下载 master 分支的代码，即 s2geometry-master.zip，然后计算 md5，这意味着每次 master 更新，download-thirdparty.sh 的 md5 就要改。这次我们将版本固定在 0239455c1e260d6d2c843649385b4fb9f5b28dba，应当能稳定很长时间