Merge pull request #1612 from mshockwave/master

Fix wrong include path of antlr4cpp runtime in cmake/ExternalAntlr4Cpp.cmake
This commit is contained in:
Terence Parr 2017-01-24 09:51:05 -08:00 committed by GitHub
commit 8d9e8f2d20
2 changed files with 3 additions and 2 deletions

View File

@ -130,3 +130,4 @@ YYYY/MM/DD, github id, Full name, email
2016/12/22, akosthekiss, Akos Kiss, akiss@inf.u-szeged.hu
2016/12/24, adrpo, Adrian Pop, adrian.pop@liu.se
2017/01/13, marcelo-rocha, Marcelo Rocha, mcrocha@gmail.com
2017/01/18, mshockwave, Bekket McClane, yihshyng223@gmail.com

View File

@ -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")