diff options
| author | Burt P <pburt0@gmail.com> | 2018-12-03 23:17:03 -0600 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2018-12-04 10:49:45 -0800 |
| commit | ef03a9ce3788bdb8ce6b23564b139577c9438655 (patch) | |
| tree | d32f53f38e910f868d92623a858834a7153e0a99 /CMakeLists.txt | |
| parent | 3523a27c7ac77d10c3911ddee18541bbda35cbc4 (diff) | |
Replaces the uber-graph submodule with a local fork
Includes the hardinfo-required source files directly instead of
using a git submodule. The original is unmaintained.
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa27def2..c531ab1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/includes ${CMAKE_SOURCE_DIR}/includes/${HARDINFO_ARCH} - ${CMAKE_SOURCE_DIR}/deps/uber-graph/uber + ${CMAKE_SOURCE_DIR}/deps/uber-graph ${CMAKE_BINARY_DIR} ${GTK_INCLUDE_DIRS} ${LIBSOUP_INCLUDE_DIRS} @@ -205,18 +205,19 @@ endforeach() if (HARDINFO_GTK3) add_library(uber-graph STATIC - deps/uber-graph/uber/g-ring.c - deps/uber-graph/uber/uber-frame-source.c - deps/uber-graph/uber/uber-graph.c - deps/uber-graph/uber/uber-heat-map.c - deps/uber-graph/uber/uber-label.c - deps/uber-graph/uber/uber-line-graph.c - deps/uber-graph/uber/uber-range.c - deps/uber-graph/uber/uber-scale.c - deps/uber-graph/uber/uber-scatter.c - deps/uber-graph/uber/uber-timeout-interval.c - deps/uber-graph/uber/uber-window.c + deps/uber-graph/g-ring.c + deps/uber-graph/uber-frame-source.c + deps/uber-graph/uber-graph.c + deps/uber-graph/uber-heat-map.c + deps/uber-graph/uber-label.c + deps/uber-graph/uber-line-graph.c + deps/uber-graph/uber-range.c + deps/uber-graph/uber-scale.c + deps/uber-graph/uber-scatter.c + deps/uber-graph/uber-timeout-interval.c + deps/uber-graph/uber-window.c ) +set_target_properties(uber-graph PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") endif() set_source_files_properties( @@ -264,6 +265,7 @@ target_link_libraries(hardinfo ${ZLIB_LIBRARIES} ${X11_LIBRARIES} ) +set_target_properties(hardinfo PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") else() add_executable(hardinfo hardinfo/usb_util.c |