diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-12 21:22:03 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-12 21:22:03 (GMT) |
| commit | 97bcc770006f08d8a4aa383a6ccd93b1d1d6d324 (patch) | |
| tree | 05c06e7f29635ef3d909c9ba5a83d34d6da74049 | |
| parent | 568bb9eed0b52a0dd0eda1a078bb895072084d43 (diff) | |
| parent | 816ad49cabb1fafb40275b8796667d8d1f689aed (diff) | |
| download | Doxygen-97bcc770006f08d8a4aa383a6ccd93b1d1d6d324.zip Doxygen-97bcc770006f08d8a4aa383a6ccd93b1d1d6d324.tar.gz Doxygen-97bcc770006f08d8a4aa383a6ccd93b1d1d6d324.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vhdlparser/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2644ceb..8ab5aa7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,9 +82,11 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) if (CMAKE_GENERATOR MATCHES "Ninja") set(LEX_FLAGS ) set(YACC_FLAGS ) + set(JAVACC_FLAGS ) else () set(LEX_FLAGS $(LEX_FLAGS)) set(YACC_FLAGS $(YACC_FLAGS)) + set(JAVACC_FLAGS $(JAVACC_FLAGS)) endif () find_program(DOT NAMES dot) diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt index ad5af28..43dc74d 100644 --- a/vhdlparser/CMakeLists.txt +++ b/vhdlparser/CMakeLists.txt @@ -1,7 +1,7 @@ find_package(Javacc) if (JAVACC_FOUND) add_custom_command( - COMMAND ${JAVACC_EXECUTABLE} -OUTPUT_DIRECTORY=${CMAKE_SOURCE_DIR}/vhdlparser ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj + COMMAND ${JAVACC_EXECUTABLE} ${JAVACC_FLAGS} -OUTPUT_DIRECTORY=${CMAKE_SOURCE_DIR}/vhdlparser ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj DEPENDS ${CMAKE_SOURCE_DIR}/vhdlparser/vhdlparser.jj OUTPUT ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.cc ${CMAKE_SOURCE_DIR}/vhdlparser/CharStream.h ${CMAKE_SOURCE_DIR}/vhdlparser/ErrorHandler.h ${CMAKE_SOURCE_DIR}/vhdlparser/JavaCC.h ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.cc ${CMAKE_SOURCE_DIR}/vhdlparser/ParseException.h ${CMAKE_SOURCE_DIR}/vhdlparser/Token.cc ${CMAKE_SOURCE_DIR}/vhdlparser/Token.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenManager.h ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.cc ${CMAKE_SOURCE_DIR}/vhdlparser/TokenMgrError.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParser.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserConstants.h ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.cc ${CMAKE_SOURCE_DIR}/vhdlparser/VhdlParserTokenManager.h ) |