CMakeLists.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68f049e..474e613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,9 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif() -set(ANTLR_DIR libs/antlr-2.7.7) set(QHEXEDIT_DIR libs/qhexedit) -set(QCUSTOMPLOT_DIR libs/qcustomplot-source) -add_subdirectory(${ANTLR_DIR}) add_subdirectory(${QHEXEDIT_DIR}) -add_subdirectory(${QCUSTOMPLOT_DIR}) if(USE_QT5) find_package(Qt5Widgets REQUIRED) @@ -165,9 +161,7 @@ endif(APPLE) include_directories( "${CMAKE_CURRENT_BINARY_DIR}" - ${ANTLR_DIR} ${QHEXEDIT_DIR} - ${QCUSTOMPLOT_DIR} ${ADDITIONAL_INCLUDE_PATHS} src) @@ -183,12 +177,10 @@ if(USE_QT5) qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport) set(QT_LIBRARIES "") endif() -add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot) +add_dependencies(${PROJECT_NAME} qhexedit) link_directories( - "${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}" - "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}" - "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}") + "${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}") target_link_libraries(${PROJECT_NAME} antlr