mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-14 23:49:10 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
71 lines
1.9 KiB
Diff
71 lines
1.9 KiB
Diff
CMakeLists.txt | 12 ++----------
|
|
tests/CMakeLists.txt | 5 +----
|
|
2 files changed, 3 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 4a76947..a58510b 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)
|
|
@@ -191,9 +187,7 @@ endif(EXTRAPATH)
|
|
|
|
include_directories(
|
|
"${CMAKE_CURRENT_BINARY_DIR}"
|
|
- ${ANTLR_DIR}
|
|
${QHEXEDIT_DIR}
|
|
- ${QCUSTOMPLOT_DIR}
|
|
${ADDITIONAL_INCLUDE_PATHS}
|
|
src)
|
|
|
|
@@ -210,12 +204,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
|
|
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
|
index 75009dc..6fd7f48 100644
|
|
--- a/tests/CMakeLists.txt
|
|
+++ b/tests/CMakeLists.txt
|
|
@@ -7,9 +7,6 @@ if(NOT CMAKE_BUILD_TYPE)
|
|
set(CMAKE_BUILD_TYPE "Release")
|
|
endif()
|
|
|
|
-set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
|
|
-add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
|
|
-
|
|
if(USE_QT5)
|
|
find_package(Qt5Widgets REQUIRED)
|
|
set(CMAKE_AUTOMOC ON)
|
|
@@ -56,7 +53,7 @@ if(NOT USE_QT5)
|
|
QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
|
|
endif()
|
|
|
|
-include_directories("${ANTLR_DIR}" ../src)
|
|
+include_directories(../src)
|
|
|
|
add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC})
|
|
|