Skip to content

Commit d9334a8

Browse files
committed
using qhexview as a proper sub-library
updating cmake to be slightly more modern
1 parent 61f2344 commit d9334a8

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/CMakeLists.txt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ set(edb_SRCS
121121
capstone-edb/include/Operand.h
122122
edb.cpp
123123
main.cpp
124-
qhexview/QHexView
125-
qhexview/qhexview.cpp
126-
qhexview/qhexview.h
127124
session/SessionError.cpp
128125
session/SessionError.h
129126
session/SessionManager.cpp
@@ -282,6 +279,7 @@ if (NOT DEFINED DEFAULT_PLUGIN_DIR)
282279
message(STATUS "Using default value of EDB Plugin directory")
283280
set(DEFAULT_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/edb")
284281
endif()
282+
285283
target_compile_definitions(edb PRIVATE -DDEFAULT_PLUGIN_PATH="${DEFAULT_PLUGIN_DIR}")
286284

287285
target_link_libraries(edb
@@ -290,25 +288,28 @@ target_link_libraries(edb
290288
Qt5::Xml
291289
Qt5::XmlPatterns
292290
Qt5::Svg
291+
QHexView
293292
${DOUBLE_CONVERSION_LIBRARIES}
294293
)
295294

296295
target_include_directories (edb PRIVATE
297296
"capstone-edb"
298-
"qhexview"
299297
"widgets"
300298
"session"
301299
)
302300

303-
304301
target_add_warnings(edb)
305302

306303
install (TARGETS edb DESTINATION ${CMAKE_INSTALL_BINDIR})
307304

308-
set_property(TARGET edb PROPERTY CXX_EXTENSIONS OFF)
309-
set_property(TARGET edb PROPERTY CXX_STANDARD 17)
310-
set_property(TARGET edb PROPERTY CXX_STANDARD_REQUIRED ON)
311-
set_property(TARGET edb PROPERTY ENABLE_EXPORTS TRUE)
312-
set_property(TARGET edb PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
305+
set_target_properties(edb
306+
PROPERTIES
307+
CXX_EXTENSIONS OFF
308+
CXX_STANDARD 17
309+
CXX_STANDARD_REQUIRED ON
310+
ENABLE_EXPORTS TRUE
311+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
312+
)
313313

314314
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/test")
315+
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/qhexview")

src/qhexview

0 commit comments

Comments
 (0)