mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 21:49:00 +08:00
c72572f731
* [antlr4] update to 4.9.1 * update version * [antlr4] fix utfcpp dependency issue * fix version SHA to account for utfcpp patch * [antlr4] Minimize patch Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
|
|
index a8503bb61..e7b01b7cb 100644
|
|
--- a/runtime/CMakeLists.txt
|
|
+++ b/runtime/CMakeLists.txt
|
|
@@ -1,17 +1,3 @@
|
|
-
|
|
-include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
|
|
-
|
|
-set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty)
|
|
-set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp)
|
|
-ExternalProject_Add(
|
|
- utfcpp
|
|
- GIT_REPOSITORY "git://github.com/nemtrif/utfcpp"
|
|
- GIT_TAG "v3.1.1"
|
|
- SOURCE_DIR ${UTFCPP_DIR}
|
|
- UPDATE_DISCONNECTED 1
|
|
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON
|
|
- TEST_AFTER_INSTALL 1
|
|
- STEP_TARGETS build)
|
|
|
|
|
|
include_directories(
|
|
@@ -23,8 +13,6 @@ include_directories(
|
|
${PROJECT_SOURCE_DIR}/runtime/src/tree
|
|
${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern
|
|
${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath
|
|
- ${UTFCPP_DIR}/install/include/utf8cpp
|
|
- ${UTFCPP_DIR}/install/include/utf8cpp/utf8
|
|
)
|
|
|
|
|
|
@@ -131,13 +119,6 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
|
|
FILES_MATCHING PATTERN "*.h"
|
|
)
|
|
|
|
-install(FILES "${UTFCPP_DIR}/source/utf8.h"
|
|
- DESTINATION "include/antlr4-runtime")
|
|
-install(DIRECTORY "${UTFCPP_DIR}/source/utf8"
|
|
- DESTINATION "include/antlr4-runtime"
|
|
- COMPONENT dev
|
|
- FILES_MATCHING PATTERN "*.h"
|
|
- )
|
|
|
|
|
|
|