diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2016-05-05 11:03:22 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2016-05-05 11:08:17 +0100 |
| commit | be6cf883b322b52371f7a45bea4d0339ed2fc29d (patch) | |
| tree | 1ca9e587462c875c5cace80e111bef6b66091268 | |
| parent | 79b8e8db623de83c738157fae37f0486a5c81032 (diff) | |
highlight: Move into libs.
| -rw-r--r-- | cli/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | common/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/highlight/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/highlight/highlight.cpp (renamed from common/highlight.cpp) | 0 | ||||
| -rw-r--r-- | lib/highlight/highlight.hpp (renamed from common/highlight.hpp) | 0 | ||||
| -rw-r--r-- | retrace/CMakeLists.txt | 1 |
7 files changed, 9 insertions, 1 deletions
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index a1711215..0863e57f 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -15,6 +15,7 @@ else () endif () include_directories ( + ${CMAKE_SOURCE_DIR}/lib/highlight ${CMAKE_SOURCE_DIR}/thirdparty ) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 6de7b4e1..a01dc1ba 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,5 +1,6 @@ include_directories ( ${CMAKE_SOURCE_DIR}/lib/guids + ${CMAKE_SOURCE_DIR}/lib/highlight ${CMAKE_SOURCE_DIR}/thirdparty ) @@ -34,11 +35,11 @@ add_convenience_library (common ${os} os_backtrace.cpp os_crtdbg.cpp - highlight.cpp ) target_link_libraries (common guids + highlight ${LIBBACKTRACE_LIBRARIES} brotli_dec_bundled ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2bdad31e..3ce90a6e 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1 +1,2 @@ add_subdirectory (guids) +add_subdirectory (highlight) diff --git a/lib/highlight/CMakeLists.txt b/lib/highlight/CMakeLists.txt new file mode 100644 index 00000000..1f3c5962 --- /dev/null +++ b/lib/highlight/CMakeLists.txt @@ -0,0 +1,4 @@ +add_convenience_library (highlight + highlight.hpp + highlight.cpp +) diff --git a/common/highlight.cpp b/lib/highlight/highlight.cpp index f3555f3f..f3555f3f 100644 --- a/common/highlight.cpp +++ b/lib/highlight/highlight.cpp diff --git a/common/highlight.hpp b/lib/highlight/highlight.hpp index bda49142..bda49142 100644 --- a/common/highlight.hpp +++ b/lib/highlight/highlight.hpp diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt index 4e609e10..a96becdc 100644 --- a/retrace/CMakeLists.txt +++ b/retrace/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib/highlight ${CMAKE_SOURCE_DIR}/helpers ${CMAKE_BINARY_DIR}/dispatch ${CMAKE_SOURCE_DIR}/dispatch |