jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

不同仓库的合并请求带刷新 #16

Closed
jasder wants to merge 30 commits from forgetest1/antlr:12231 into fix-3216
pull from: forgetest1/antlr:12231
merge into: jasder:fix-3216
Conversation 0 Commits 30 Files Changed 8 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6255420440 - Show all commits

1
contributors.txt
View File

@ -293,3 +293,4 @@ YYYY/MM/DD, github id, Full name, email
2021/03/02, hackeris 2021/03/02, hackeris
2021/03/03, xTachyon, Damian Andrei, xTachyon@users.noreply.github.com 2021/03/03, xTachyon, Damian Andrei, xTachyon@users.noreply.github.com
2021/04/07, b1f6c1c4, Jinzheng Tu, b1f6c1c4@gmail.com 2021/04/07, b1f6c1c4, Jinzheng Tu, b1f6c1c4@gmail.com
2021/04/24, bigerl, Alexander Bigerl, alexander [äät] bigerl [pkt] eu

3
runtime/Cpp/runtime/CMakeLists.txt
View File

@ -61,8 +61,7 @@ else()
GIT_TAG "v3.1.1" GIT_TAG "v3.1.1"
SOURCE_DIR ${UTFCPP_DIR} SOURCE_DIR ${UTFCPP_DIR}
UPDATE_DISCONNECTED 1 UPDATE_DISCONNECTED 1
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -DUTF8_TESTS=off -DUTF8_SAMPLES=off
TEST_AFTER_INSTALL 1
STEP_TARGETS build) STEP_TARGETS build)
include_directories( include_directories(