refactor: simplify CMake path references

This commit is contained in:
horsicq
2026-08-02 15:38:29 +02:00
parent d7d6c98538
commit 890afcfbb1
3 changed files with 21 additions and 22 deletions
+7 -8
View File
@@ -54,7 +54,6 @@ set(X_MACOS_INFO_PLIST "${X_RESOURCE_DIR}/macos/Info.plist")
# --- Optional: packaging support via _mylibs ---
set(DIE_DEPLOY_INIT "${CMAKE_SOURCE_DIR}/dep/build_tools/cmake/deploy_init.cmake")
if(EXISTS "${DIE_DEPLOY_INIT}")
include("${DIE_DEPLOY_INIT}")
else()
@@ -62,7 +61,7 @@ else()
endif()
# --- Translations ---
set(DIE_TRANSLATION_HELPER "${CMAKE_CURRENT_LIST_DIR}/../build_tools/cmake/deploy_translation.cmake")
set(DIE_TRANSLATION_HELPER "${CMAKE_SOURCE_DIR}/dep/build_tools/cmake/deploy_translation.cmake")
if(EXISTS "${DIE_TRANSLATION_HELPER}")
include("${DIE_TRANSLATION_HELPER}")
@@ -102,12 +101,12 @@ if(EXISTS "${DIE_TRANSLATION_HELPER}")
endif()
# --- Library subdirectories ---
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../dep/XCppfilt" XCppfilt)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../dep/XCapstone" XCapstone)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../dep/XCapstone/x86" XCapstone_86)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../dep/XArchive" XArchive)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../dep/XYara" XYara)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../dep/Formats/xsimd" XSIMD)
add_subdirectory("${CMAKE_SOURCE_DIR}/dep/XCppfilt" XCppfilt)
add_subdirectory("${CMAKE_SOURCE_DIR}/dep/XCapstone" XCapstone)
add_subdirectory("${CMAKE_SOURCE_DIR}/dep/XCapstone/x86" XCapstone_86)
add_subdirectory("${CMAKE_SOURCE_DIR}/dep/XArchive" XArchive)
add_subdirectory("${CMAKE_SOURCE_DIR}/dep/XYara" XYara)
add_subdirectory("${CMAKE_SOURCE_DIR}/dep/Formats/xsimd" XSIMD)
# --- Executable targets ---
add_subdirectory(gui)
+12 -12
View File
@@ -121,7 +121,7 @@ endif()
if(UNIX AND NOT APPLE)
set(DIE_RUNTIME_DESTINATION "${CMAKE_INSTALL_BINDIR}")
set(DIE_DOC_DESTINATION "${CMAKE_INSTALL_DOCDIR}/detect-it-easy")
set(DIE_DESKTOP_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/res/linux/die.desktop.in")
set(DIE_DESKTOP_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/../../res/linux/die.desktop.in")
set(DIE_DESKTOP_FILE "${CMAKE_CURRENT_BINARY_DIR}/die.desktop")
if(EXISTS "${DIE_DESKTOP_TEMPLATE}")
configure_file("${DIE_DESKTOP_TEMPLATE}" "${DIE_DESKTOP_FILE}" @ONLY)
@@ -138,8 +138,8 @@ install(TARGETS ${DIE_GUI_TARGET}
if(UNIX AND NOT APPLE)
install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/LICENSE"
"${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/README.md"
"${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE"
"${CMAKE_CURRENT_SOURCE_DIR}/../../README.md"
DESTINATION ${DIE_DOC_DESTINATION}
OPTIONAL
)
@@ -147,33 +147,33 @@ if(UNIX AND NOT APPLE)
install(FILES "${DIE_DESKTOP_FILE}"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
endif()
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/LINUX/hicolor/"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../LINUX/hicolor/"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor"
OPTIONAL
)
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/LINUX/io.github.horsicq.detect-it-easy.metainfo.xml"
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../LINUX/io.github.horsicq.detect-it-easy.metainfo.xml"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo"
OPTIONAL
)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/XStyles/qss"
install(DIRECTORY "${CMAKE_SOURCE_DIR}/dep/XStyles/qss"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/die" OPTIONAL)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/XInfoDB/info"
install(DIRECTORY "${CMAKE_SOURCE_DIR}/dep/XInfoDB/info"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/die" OPTIONAL)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/Detect-It-Easy/db"
install(DIRECTORY "${CMAKE_SOURCE_DIR}/dep/Detect-It-Easy/db"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/die" OPTIONAL)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/XYara/yara_rules"
install(DIRECTORY "${CMAKE_SOURCE_DIR}/dep/XYara/yara_rules"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/die" OPTIONAL)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/images"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../images"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/die" OPTIONAL)
else()
install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/LICENSE"
"${CMAKE_CURRENT_SOURCE_DIR}/../../LICENSE"
DESTINATION .
RENAME LICENSE.txt
OPTIONAL
)
install(FILES
"${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SOURCE_DIR}/dep/README.md"
"${CMAKE_CURRENT_SOURCE_DIR}/../../README.md"
"${X_WINDOWS_ICON}"
DESTINATION .
OPTIONAL
+2 -2
View File
@@ -21,7 +21,7 @@ if(UNIX AND NOT APPLE)
include(GNUInstallDirs)
endif()
set(DIEL_LITE_ICON "${CMAKE_SOURCE_DIR}/dep/icons/lite.icns")
set(DIEL_LITE_ICON "${CMAKE_CURRENT_LIST_DIR}/../../icons/lite.icns")
set(DIEL_SOURCES
${DIE_SCRIPT_SOURCES}
@@ -42,7 +42,7 @@ endif()
if(WIN32 AND EXISTS "${X_WINDOWS_RESOURCE_ICON_RC_IN}")
set(X_ORIGINAL_FILENAME "diel")
set(X_WINDOWS_ICON "${CMAKE_SOURCE_DIR}/dep/icons/lite.ico")
set(X_WINDOWS_ICON "${CMAKE_CURRENT_LIST_DIR}/../../icons/lite.ico")
configure_file("${X_WINDOWS_RESOURCE_ICON_RC_IN}"
"${CMAKE_CURRENT_BINARY_DIR}/resource_diel.rc" @ONLY)
configure_file("${X_RESOURCE_DIR}/windows/windows.manifest.xml"