1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
|
From: Arto Jantunen <viiru@debian.org>
Date: Fri, 25 Jul 2014 16:28:47 +0300
Subject: Use external qcustomplot and antlr
---
CMakeLists.txt | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0205698..04af70e 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)
@@ -143,9 +139,7 @@ endif(APPLE)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${ANTLR_DIR}
${QHEXEDIT_DIR}
- ${QCUSTOMPLOT_DIR}
${ADDITIONAL_INCLUDE_PATHS}
src)
@@ -163,9 +157,7 @@ endif()
add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
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
|