Skip to content

Commit

Permalink
using qhexview as a proper sub-library
Browse files Browse the repository at this point in the history
updating cmake to be slightly more modern
  • Loading branch information
eteran committed Mar 28, 2024
1 parent 61f2344 commit d9334a8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
21 changes: 11 additions & 10 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ set(edb_SRCS
capstone-edb/include/Operand.h
edb.cpp
main.cpp
qhexview/QHexView
qhexview/qhexview.cpp
qhexview/qhexview.h
session/SessionError.cpp
session/SessionError.h
session/SessionManager.cpp
Expand Down Expand Up @@ -282,6 +279,7 @@ if (NOT DEFINED DEFAULT_PLUGIN_DIR)
message(STATUS "Using default value of EDB Plugin directory")
set(DEFAULT_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/edb")
endif()

target_compile_definitions(edb PRIVATE -DDEFAULT_PLUGIN_PATH="${DEFAULT_PLUGIN_DIR}")

target_link_libraries(edb
Expand All @@ -290,25 +288,28 @@ target_link_libraries(edb
Qt5::Xml
Qt5::XmlPatterns
Qt5::Svg
QHexView
${DOUBLE_CONVERSION_LIBRARIES}
)

target_include_directories (edb PRIVATE
"capstone-edb"
"qhexview"
"widgets"
"session"
)


target_add_warnings(edb)

install (TARGETS edb DESTINATION ${CMAKE_INSTALL_BINDIR})

set_property(TARGET edb PROPERTY CXX_EXTENSIONS OFF)
set_property(TARGET edb PROPERTY CXX_STANDARD 17)
set_property(TARGET edb PROPERTY CXX_STANDARD_REQUIRED ON)
set_property(TARGET edb PROPERTY ENABLE_EXPORTS TRUE)
set_property(TARGET edb PROPERTY RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
set_target_properties(edb
PROPERTIES
CXX_EXTENSIONS OFF
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON
ENABLE_EXPORTS TRUE
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
)

add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/test")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/qhexview")
2 changes: 1 addition & 1 deletion src/qhexview
Submodule qhexview updated 3 files
+31 −0 CMakeLists.txt
+48 −41 qhexview.cpp
+14 −14 qhexview.h

0 comments on commit d9334a8

Please sign in to comment.