diff options
| author | bilabila | 2020-06-22 14:15:02 +0800 |
|---|---|---|
| committer | bilabila | 2020-06-22 14:15:02 +0800 |
| commit | f0c2a48e8e5bd259112478992e29796b27ae8b8a (patch) | |
| tree | 5264e8076b448cd08cc454a7dececc0ac02b73b5 /lib.patch | |
| parent | 1bb88846f9eb0565f08daca5c23673e33a1ff8cb (diff) | |
| download | aur-f0c2a48e8e5bd259112478992e29796b27ae8b8a.tar.gz | |
v1.3.4
Diffstat (limited to 'lib.patch')
| -rw-r--r-- | lib.patch | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/lib.patch b/lib.patch index b73a33d87199..c88e389eaf67 100644 --- a/lib.patch +++ b/lib.patch @@ -1,41 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71ac4a5..d4a3727 100644 +index 09c11a9..1211935 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -44,9 +44,7 @@ endif() - include_directories( +@@ -54,8 +54,7 @@ include_directories( ${PROJECT_SOURCE_DIR}/generated/ ${PROJECT_SOURCE_DIR}/third_party/ -- ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include + ${PROJECT_SOURCE_DIR}/third_party/Catch2/single_include - ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/include - ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src + /usr/include/antlr4-runtime ${PROJECT_SOURCE_DIR}/src/ ) -@@ -60,16 +58,6 @@ set(src_dir - ${PROJECT_SOURCE_DIR}/generated/LuaBaseVisitor.cpp - ) +@@ -77,8 +76,6 @@ file(GLOB_RECURSE yaml-cpp-src + ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp + ) --file(GLOB_RECURSE antlr4-cpp-src -- ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src/*.cpp --) -- --file(GLOB_RECURSE yaml-cpp-src -- ${PROJECT_SOURCE_DIR}/third_party/yaml-cpp/src/*.cpp --) -- -add_library (antlr4-cpp-runtime ${antlr4-cpp-src}) -add_library (yaml-cpp ${yaml-cpp-src}) add_executable(lua-format ${src_dir} src/main.cpp) -@@ -80,7 +68,7 @@ endif() +@@ -89,7 +86,7 @@ endif() set_target_properties(lua-format PROPERTIES LINKER_LANGUAGE CXX) --target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime) -+target_link_libraries(lua-format yaml-cpp antlr4-runtime) +-target_link_libraries(lua-format yaml-cpp antlr4-cpp-runtime ${extra-libs}) ++target_link_libraries(lua-format yaml-cpp antlr4-runtime ${extra-libs}) install(TARGETS lua-format RUNTIME DESTINATION bin |