From d733016fd49e00ce3880bbbf2f4948d104a8671d Mon Sep 17 00:00:00 2001 From: mshockwave Date: Wed, 18 Jan 2017 15:09:10 +0800 Subject: [PATCH] fix wrong antlr4cpp runtime include path --- contributors.txt | 1 + runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contributors.txt b/contributors.txt index f97f51737..13d919e3d 100644 --- a/contributors.txt +++ b/contributors.txt @@ -129,3 +129,4 @@ YYYY/MM/DD, github id, Full name, email 2016/12/11, Gaulouis, Gaulouis, gaulouis.com@gmail.com 2016/12/22, akosthekiss, Akos Kiss, akiss@inf.u-szeged.hu 2016/12/24, adrpo, Adrian Pop, adrian.pop@liu.se +2017/01/18, mshockwave, Bekket McClane, yihshyng223@gmail.com diff --git a/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake b/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake index 17ebf8db7..6f10ad35f 100644 --- a/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake +++ b/runtime/Cpp/cmake/ExternalAntlr4Cpp.cmake @@ -155,9 +155,9 @@ ExternalProject_ADD( ExternalProject_Get_Property(antlr4cpp INSTALL_DIR) -list(APPEND ANTLR4CPP_INCLUDE_DIRS ${INSTALL_DIR}/include) +list(APPEND ANTLR4CPP_INCLUDE_DIRS ${INSTALL_DIR}/include/antlr4-runtime) foreach(src_path misc atn dfa tree support) - list(APPEND ANTLR4CPP_INCLUDE_DIRS ${INSTALL_DIR}/include/${src_path}) + list(APPEND ANTLR4CPP_INCLUDE_DIRS ${INSTALL_DIR}/include/antlr4-runtime/${src_path}) endforeach(src_path) set(ANTLR4CPP_LIBS "${INSTALL_DIR}/lib")