changing Cmake #344
Merged
changing Cmake #344
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
|
|
yangbofun
reviewed
Oct 18, 2023
dipu/CMakeLists.txt
Outdated
| @@ -110,8 +110,9 @@ include_directories(${TORCH_INCLUDE_DIRS}) | |||
| message(STATUS "Torch TORCH_INCLUDE_DIRS: ${TORCH_INCLUDE_DIRS}") | |||
|
|
|||
| # diopi | |||
| set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto") | |||
| include_directories(${DIOPI_PROTO_PATH}/include) | |||
| # set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto") | |||
There was a problem hiding this comment.
这里别写死。当环境变量DIOPI_PATH没有的时候，用"${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto"，下同。
yangbofun
reviewed
Oct 18, 2023
dipu/CMakeLists.txt
Outdated
| set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto") | ||
| include_directories(${DIOPI_PROTO_PATH}/include) | ||
| if (EXISTS $ENV{DIOPI_PATH}) | ||
| message("Using Specified DIOPI_PATH") |
There was a problem hiding this comment.
message(STATUS "DIOPI_PATH: $ENV{DIOPI_PATH}")
lljbash
reviewed
Oct 18, 2023
yangbofun
approved these changes
Oct 19, 2023
我们先合了，有个任务依赖这个，你到时候在你的pr中，把这里再改了。 |
zhaoguochun1995
approved these changes
Oct 19, 2023
mrdanielw
reviewed
Oct 19, 2023
| include_directories($ENV{DIOPI_PATH}/include) | ||
| else() | ||
| set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto") | ||
| include_directories(${DIOPI_PROTO_PATH}/include) |
There was a problem hiding this comment.
既然 set了 DIOPI_PROTO_PATH 为什么 不把 include_directories(${DIOPI_PROTO_PATH}/include) 挪到 if else 外面 分支里面少留点东西
说错了，是 #301，已经完成了，麻烦也 review 一下吧。 |
lljbash
reviewed
Oct 19, 2023
Comment on lines
+113
to
+119
| if (EXISTS $ENV{DIOPI_PATH}) | ||
| message(STATUS "DIOPI_PATH: $ENV{DIOPI_PATH}") | ||
| set(DIOPI_PROTO_PATH $ENV{DIOPI_PATH}) | ||
| include_directories($ENV{DIOPI_PATH}/include) | ||
| else() | ||
| set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto") | ||
| include_directories(${DIOPI_PROTO_PATH}/include) |
There was a problem hiding this comment.
Suggested change
| if (EXISTS $ENV{DIOPI_PATH}) | |
| message(STATUS "DIOPI_PATH: $ENV{DIOPI_PATH}") | |
| set(DIOPI_PROTO_PATH $ENV{DIOPI_PATH}) | |
| include_directories($ENV{DIOPI_PATH}/include) | |
| else() | |
| set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto") | |
| include_directories(${DIOPI_PROTO_PATH}/include) | |
| if (EXISTS $ENV{DIOPI_PATH}) | |
| message(STATUS "DIOPI_PATH: $ENV{DIOPI_PATH}") | |
| set(DIOPI_PROTO_PATH $ENV{DIOPI_PATH}) | |
| else() | |
| set(DIOPI_PROTO_PATH "${PROJECT_SOURCE_DIR}/third_party/DIOPI/proto") | |
| include_directories(${DIOPI_PROTO_PATH}/include) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
DIOPI_PATH can be changed in CMAKE